Merge branch 'master' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 2 Jun 2014 13:13:09 +0000 (15:13 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 2 Jun 2014 13:13:09 +0000 (15:13 +0200)

Trivial merge