Merge branch 'develop'
authormasensio <masensio@solidgear.es>
Mon, 24 Aug 2015 11:01:12 +0000 (13:01 +0200)
committermasensio <masensio@solidgear.es>
Mon, 24 Aug 2015 11:01:12 +0000 (13:01 +0200)

Trivial merge