Merge remote-tracking branch 'origin/5.6.2' into 5.6
authorLiang Qi <liang.qi@qt.io>
Fri, 30 Sep 2016 12:36:23 +0000 (14:36 +0200)
committerLiang Qi <liang.qi@qt.io>
Fri, 30 Sep 2016 12:36:23 +0000 (14:36 +0200)
Conflicts:
.gitmodules

Change-Id: Ifffec3df90687a6ad84547bb0f603b0446bf0e9d


Trivial merge