Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 3 Dec 2013 17:27:38 +0000 (18:27 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 3 Dec 2013 17:27:38 +0000 (18:27 +0100)
Change-Id: I866aa4b65d19c49eca0df97db93dd2833a134d08


Trivial merge