Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 10 Jan 2014 17:31:41 +0000 (18:31 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 10 Jan 2014 17:31:41 +0000 (18:31 +0100)
Change-Id: I0ddb08a2fff6bd0da01e14726f2789741b509e76


Trivial merge