Merge master@5406228 into qt-dev. am: 74f2ca30c1
am: ac8cdb43a4

Change-Id: Ifd5cf357a22d64bb3aa9871fb4874066311d25df