Merge master@5406228 into qt-dev.

Change-Id: I7f2921bcfff17467e04d01fd76028681a7660818
BUG: 129345239