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)
commit792f91dc8754ea906eea1268f55e66256c2c97a9
treebe5e7325978d60c3b496fb7ec83ca1caa2e05677
parentc9d71e9eeb925ee4236acefeb88b14d80d04ba5e
parentc5557d43eea3c65591e37e3c79b6fa0f590c915b
Merge remote-tracking branch 'origin/5.6.2' into 5.6

Conflicts:
.gitmodules

Change-Id: Ifffec3df90687a6ad84547bb0f603b0446bf0e9d