Merge branch 'master' of github.com:hplgit/doconce
Merge branch 'master' into gh-pages