Text edit.
Cleanup.
Merge branch 'master' into gh-pages