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