Merge master@5406228 into qt-dev. am: e516d1dc0e
am: a3f70e0866

Change-Id: I3da509f7ef46f281ad42e47a8fbc34ba4f2a6270