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

Change-Id: I1a2df0e42f5c46875c5bbeb2181aa9219e8d57af