Merge branch 'master' into release-1.4.2
authormasensio <masensio@solidgear.es>
Tue, 16 Jul 2013 07:05:34 +0000 (09:05 +0200)
committermasensio <masensio@solidgear.es>
Tue, 16 Jul 2013 07:05:34 +0000 (09:05 +0200)

Trivial merge