Merge remote-tracking branch 'origin/develop' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 23 Jun 2014 06:49:06 +0000 (08:49 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 23 Jun 2014 06:49:06 +0000 (08:49 +0200)

Trivial merge