Merge remote-tracking branch 'origin/dev' into stable
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Wed, 19 Feb 2014 09:04:30 +0000 (10:04 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>
Wed, 19 Feb 2014 09:05:11 +0000 (10:05 +0100)
Change-Id: I84b36fa41f3d5f8fea2dec2545f72ebe6a0c7908


Trivial merge