Merge master@5406228 into qt-dev. am: 60b61cd74e
am: 97e40e2847

Change-Id: I59a51ccd6e74b6eca47551345a44eaaca5730544