Merge remote-tracking branch 'origin/5.5' into dev
authorLiang Qi <liang.qi@theqtcompany.com>
Mon, 11 May 2015 08:01:29 +0000 (10:01 +0200)
committerLiang Qi <liang.qi@theqtcompany.com>
Mon, 11 May 2015 08:01:29 +0000 (10:01 +0200)
Change-Id: I0390795fa3d5f2a7ba098b514ee2da4a86e243a6


Trivial merge