Merge master@5406228 into qt-dev.
am: 996d82708d

Change-Id: I6b1eb68ffb4fedcc70d4ef1a73fc992b4f88da31