Merge branch 'master' into develop
authormasensio <masensio@solidgear.es>
Tue, 18 Aug 2015 08:16:13 +0000 (10:16 +0200)
committermasensio <masensio@solidgear.es>
Tue, 18 Aug 2015 08:16:13 +0000 (10:16 +0200)

Trivial merge