Merge master@5406228 into qt-dev. am: 33c12e7bd0
am: 0f0f51757f

Change-Id: Id283875efe0ed19b375fa46d8601b1cc85c7aba0