manually fold in documentation work from the master branch