Merge remote-tracking branch 'origin/stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Wed, 18 Sep 2013 19:50:01 +0000 (21:50 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Wed, 18 Sep 2013 19:50:01 +0000 (21:50 +0200)
Change-Id: I8f0a0ffd5e83828d3d0910ece4ec0485c85f2d14


Trivial merge