Merge master@5406228 into qt-dev. am: 667ea94fbc
am: 89dc9f5923

Change-Id: Iec82df9951729a9b996e04189e2003610036e453