Merge branch 'release-1.9' into stable oc-android-1.9
authormasensio <masensio@solidgear.es>
Thu, 3 Dec 2015 08:25:06 +0000 (09:25 +0100)
committermasensio <masensio@solidgear.es>
Thu, 3 Dec 2015 08:25:06 +0000 (09:25 +0100)

Trivial merge