Merge master@5406228 into qt-dev. am: a1382c23b4
am: 909f234f4d

Change-Id: Icdf86c896a2b8ee8147f90e60e7203662d7cd053