Merge remote-tracking branch 'origin/develop' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 4 Feb 2014 13:22:23 +0000 (14:22 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 4 Feb 2014 13:22:23 +0000 (14:22 +0100)

Trivial merge