Merge dev into 5.5
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Mon, 23 Feb 2015 10:56:15 +0000 (11:56 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Mon, 23 Feb 2015 10:56:16 +0000 (11:56 +0100)
Change-Id: I3bf7a2f27c34ac77198aabcb57f3ad7df5970649


Trivial merge