Merge branch 'master' into gh-pages
errors to check
Merge branch 'gh-pages'