Merge branch 'master' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 24 Jul 2014 07:30:11 +0000 (09:30 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 24 Jul 2014 07:30:11 +0000 (09:30 +0200)

Trivial merge