Try and fix the docs markup style for github
Merge branch 'master' into gh-pages