Add sane entry point for docs build.
Merge branch 'master' into logged