Merge remote-tracking branch 'origin/5.4.1' into 5.4
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 10 Feb 2015 09:35:51 +0000 (10:35 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 10 Feb 2015 09:35:51 +0000 (10:35 +0100)
Change-Id: Ibde5671a132665726e9a16cdb98bceb9717e45f3


Trivial merge