Merge branch 'develop' into release-1.5.4
authormasensio <masensio@solidgear.es>
Mon, 10 Feb 2014 09:19:02 +0000 (10:19 +0100)
committermasensio <masensio@solidgear.es>
Mon, 10 Feb 2014 09:19:02 +0000 (10:19 +0100)

Trivial merge