Merge remote-tracking branch 'origin/5.6.3' into 5.6
authorLiang Qi <liang.qi@qt.io>
Mon, 18 Sep 2017 07:20:32 +0000 (09:20 +0200)
committerLiang Qi <liang.qi@qt.io>
Mon, 18 Sep 2017 07:42:25 +0000 (09:42 +0200)
 Conflicts:
.gitmodules

Change-Id: I3f5310cfb9b839e622ab606fd674a58d50515c0c


Trivial merge