Merge remote-tracking branch 'origin/master' into gh-pages
Remove __py_cache__ (only needed for builds)
Merge branch 'gh-pages'