"Final" doconce version ready to produce TCSE6 4th ed.
Merge branch 'master' into gh-pages
merge