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

Trivial merge