Merge remote-tracking branch 'origin/develop'
authormasensio <masensio@solidgear.es>
Thu, 15 Oct 2015 14:17:32 +0000 (16:17 +0200)
committermasensio <masensio@solidgear.es>
Thu, 15 Oct 2015 14:17:32 +0000 (16:17 +0200)

Trivial merge