Merge remote-tracking branch 'origin/5.4' into 5.4.0
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Mon, 10 Nov 2014 10:42:05 +0000 (11:42 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>
Mon, 10 Nov 2014 10:50:11 +0000 (11:50 +0100)
Change-Id: I2c69deb3bc69da1a06485aaf72fb298b08756734


Trivial merge