update doco
update doco
Merge branch 'master' into gh-pages
recompiled