Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 24 Mar 2014 15:08:26 +0000 (16:08 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 24 Mar 2014 15:08:26 +0000 (16:08 +0100)
Change-Id: Ied78d78d873976c35a1aa51efb154b355950cf91


Trivial merge