Fix problem with out of place menus in the docs
Merge branch 'master' into gh-pages
Update docs