update documentation and build scripts
Merge branch 'master' into rebase_everything