Merge master@5406228 into qt-dev.
am: 74f2ca30c1

Change-Id: I4373e138d0d1ee0af15e1eacaafde00d963ceb33