Merge dev into 5.6
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Mon, 17 Aug 2015 18:09:49 +0000 (20:09 +0200)
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Mon, 17 Aug 2015 18:09:49 +0000 (20:09 +0200)
Change-Id: I9ec05838f3c4cbc11fb969c71daf5c2a5a8df360


Trivial merge