Merge remote-tracking branch 'origin/5.4' into dev
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Mon, 20 Oct 2014 17:13:18 +0000 (19:13 +0200)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Mon, 20 Oct 2014 17:13:19 +0000 (19:13 +0200)
Change-Id: Ie44084828edf50050c695ac4dcc1cb532651499c


Trivial merge