Merge remote-tracking branch 'origin/develop' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 11 Dec 2013 07:52:00 +0000 (08:52 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 11 Dec 2013 07:52:00 +0000 (08:52 +0100)

Trivial merge