Merge remote-tracking branch 'origin/5.5' into dev
authorLiang Qi <liang.qi@theqtcompany.com>
Wed, 3 Jun 2015 08:59:28 +0000 (10:59 +0200)
committerLiang Qi <liang.qi@theqtcompany.com>
Wed, 3 Jun 2015 08:59:29 +0000 (10:59 +0200)
Change-Id: Ie29b7ff968808d1cca2864016445bc1c973a124f


Trivial merge