Merge remote-tracking branch 'origin/stable' into dev
authorIikka Eklund <iikka.eklund@digia.com>
Tue, 1 Apr 2014 08:47:22 +0000 (11:47 +0300)
committerIikka Eklund <iikka.eklund@digia.com>
Tue, 1 Apr 2014 08:47:22 +0000 (11:47 +0300)
Change-Id: I084c5a6e44236c96f926d4d0eca4ea0544f28fa7


Trivial merge