Merge branch 'master' into develop
authormasensio <masensio@solidgear.es>
Fri, 30 May 2014 07:30:05 +0000 (09:30 +0200)
committermasensio <masensio@solidgear.es>
Fri, 30 May 2014 07:30:05 +0000 (09:30 +0200)

Trivial merge