Merge branch 'master' into gh-pages
disabled submodules
Merge branch 'gh-pages'