Merge remote-tracking branch 'origin/release-1.5.8' into release-1.5.8
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 9 Jul 2014 10:36:28 +0000 (12:36 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 9 Jul 2014 10:36:28 +0000 (12:36 +0200)

Trivial merge