Merge master@5406228 into qt-dev.
am: 4ebe617956

Change-Id: Ib7a8138ec538220a493ac9b904dc346fe57a9724