Merge branch 'master' into develop
authormasensio <masensio@solidgear.es>
Fri, 20 Feb 2015 12:20:48 +0000 (13:20 +0100)
committermasensio <masensio@solidgear.es>
Fri, 20 Feb 2015 12:20:48 +0000 (13:20 +0100)

Trivial merge