Merge master@5406228 into qt-dev. am: 577c7451c3
am: 64a1c14118

Change-Id: Ib1a0ff27e2cbf61f9c1dc57a0224510287182253