Merge branch 'master' into develop
authormasensio <masensio@solidgear.es>
Tue, 7 Jul 2015 11:15:35 +0000 (13:15 +0200)
committermasensio <masensio@solidgear.es>
Tue, 7 Jul 2015 11:15:35 +0000 (13:15 +0200)

Trivial merge