Merge branch 'gh-pages'
correcting l10n errors
megring from develop