s/others/other/
Merge branch 'master' into gh-pages