Merge branch 'master' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 12 Dec 2013 11:56:36 +0000 (12:56 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 12 Dec 2013 11:56:36 +0000 (12:56 +0100)

Trivial merge