Merge branch 'develop' into release-1.5.4
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 14 Feb 2014 13:54:47 +0000 (14:54 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 14 Feb 2014 13:54:47 +0000 (14:54 +0100)

Trivial merge