Merge "Fix a bug where + before % is ignored" into qt-dev