Merge remote-tracking branch 'origin/release-1.5.4' into release-1.5.4
authormasensio <masensio@solidgear.es>
Mon, 17 Feb 2014 12:03:30 +0000 (13:03 +0100)
committermasensio <masensio@solidgear.es>
Mon, 17 Feb 2014 12:03:30 +0000 (13:03 +0100)

Trivial merge