Merge branch 'develop' into release-1.4.6
authormasensio <masensio@solidgear.es>
Mon, 7 Oct 2013 12:36:43 +0000 (14:36 +0200)
committermasensio <masensio@solidgear.es>
Mon, 7 Oct 2013 12:36:43 +0000 (14:36 +0200)

Trivial merge