Merge branch 'master' of githubmirror:tclarke/opticks-extras-Python