Lots more docs!
Merge branch 'master' into gh-pages
Autobuild for 3cfcfe08128c79bba7cabb236fe62cb06f60af7e