6/2 navbar check
Merge branch 'master' into gh-pages