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)
commite7472f43087921c3d83ff4452bbdb67ed27ed604
tree09565f89d0e5b5a702b532b103fe677c1b13edba
parent92d1bdcb43e988919bfdcb91c0e6f366bed07145
parent12fd0d5b9b486eaf80712d390265402a3bb06f0e
Merge remote-tracking branch 'origin/5.6.3' into 5.6

 Conflicts:
.gitmodules

Change-Id: I3f5310cfb9b839e622ab606fd674a58d50515c0c