Merge remote-tracking branch 'origin/stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 13 Sep 2013 14:43:11 +0000 (16:43 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 13 Sep 2013 14:43:11 +0000 (16:43 +0200)
Change-Id: Ia3604754fdb32b0e358a635b0bb16d4fa312bf2d


Trivial merge