Merge branch 'develop' into release-1.6.2
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 21 Nov 2014 11:40:05 +0000 (12:40 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 21 Nov 2014 11:40:05 +0000 (12:40 +0100)

Trivial merge