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

Change-Id: I500575a42163e75b6bf9d0a25691733443406f79