Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 27 Jan 2014 17:58:47 +0000 (18:58 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 27 Jan 2014 17:58:47 +0000 (18:58 +0100)
Change-Id: If97b68b56071e241c659ddd231f28e433954d7be


Trivial merge