fixes #1065
Merge branch 'doc_overhaul' into testing