Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 16 Dec 2013 14:36:55 +0000 (15:36 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 16 Dec 2013 14:36:56 +0000 (15:36 +0100)
Change-Id: I4fea8b03bc8baaa97e95413f05d13f0f505705d3


Trivial merge