Merge remote-tracking branch 'origin/release-1.4.6' into release-1.4.6
authormasensio <masensio@solidgear.es>
Fri, 11 Oct 2013 12:54:13 +0000 (14:54 +0200)
committermasensio <masensio@solidgear.es>
Fri, 11 Oct 2013 12:54:13 +0000 (14:54 +0200)

Trivial merge