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

Trivial merge