Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 6 Jan 2014 15:30:18 +0000 (16:30 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 6 Jan 2014 15:30:19 +0000 (16:30 +0100)
Change-Id: Iefedab3cfc470affbd3118a4e9eb3c892945cd2a


Trivial merge