Merge remote-tracking branch 'origin/5.4.0' into 5.4
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Fri, 21 Nov 2014 12:45:22 +0000 (13:45 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Fri, 21 Nov 2014 12:45:22 +0000 (13:45 +0100)
Change-Id: If7b9ae7b6f77025c775e6b654837b5f041f1aab9


Trivial merge