'6' -> 'six'

for fun
Merge branch 'master' into gh-pages