Spanish translation by David Marchand
Merge branch 'master' into gh-pages