Fix order of 'by' in doc menu
Merge branch 'master' into gh-pages