Don't allow , or .
Merge branch 'master' into gh-pages