Merge master@5406228 into qt-dev.
am: f3da60bbaa

Change-Id: I23f783bfe77bf60d586c432609869ab81e29bff9