Merge branch 'develop' into release-1.4.6
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 8 Oct 2013 09:28:57 +0000 (11:28 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 8 Oct 2013 09:28:57 +0000 (11:28 +0200)

Trivial merge