Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 11 Apr 2014 12:17:02 +0000 (14:17 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 11 Apr 2014 12:17:02 +0000 (14:17 +0200)
Change-Id: I22263a047dc2e7fbcfda4a28b6aa0f52f216a72b


Trivial merge