Merge branch 'master' into develop
authormasensio <masensio@solidgear.es>
Mon, 26 Aug 2013 08:19:02 +0000 (10:19 +0200)
committermasensio <masensio@solidgear.es>
Mon, 26 Aug 2013 08:19:02 +0000 (10:19 +0200)

Trivial merge