Merge branch 'stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Sat, 28 Sep 2013 22:08:37 +0000 (00:08 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Sat, 28 Sep 2013 22:08:37 +0000 (00:08 +0200)
Change-Id: I2799f7a11d9fb86db03536f78b4ba1b673877207


Trivial merge