Merge branch 'master' into develop
authormasensio <masensio@solidgear.es>
Thu, 9 Apr 2015 14:57:09 +0000 (16:57 +0200)
committermasensio <masensio@solidgear.es>
Thu, 9 Apr 2015 14:57:09 +0000 (16:57 +0200)

Trivial merge