Merge remote-tracking branch 'origin/5.5' into dev
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 3 Mar 2015 17:14:50 +0000 (18:14 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 3 Mar 2015 17:14:50 +0000 (18:14 +0100)
Change-Id: Id1f9650707d821fe98e5f92ec77bc42cb96e32ed


Trivial merge