Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 30 Sep 2013 21:09:59 +0000 (23:09 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 30 Sep 2013 21:09:59 +0000 (23:09 +0200)
Change-Id: Ia74aa63894bcbe2641590f18e8171d0c677ece12


Trivial merge