Merge branch 'master' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 18 Nov 2013 07:53:48 +0000 (08:53 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 18 Nov 2013 07:53:48 +0000 (08:53 +0100)

Trivial merge