Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 11 Jul 2013 21:28:12 +0000 (23:28 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 11 Jul 2013 21:28:13 +0000 (23:28 +0200)
Change-Id: I7ca374a1c97a80238af7d6471626ec8db94a5990


Trivial merge