Merge branch 'master' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 24 Oct 2014 13:24:50 +0000 (15:24 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 24 Oct 2014 13:24:50 +0000 (15:24 +0200)

Trivial merge