PyShell is functional
Merge branch 'master' into permissions-fix