Merge master@5406228 into qt-dev.
am: 43a35059b9

Change-Id: I0d0ad5dedde62cc8a9cc68e7ec1a208502294bfe