Merge remote-tracking branch 'origin/develop' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 6 Aug 2013 10:17:52 +0000 (12:17 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 6 Aug 2013 10:17:52 +0000 (12:17 +0200)

Trivial merge