Included changes made during prerelease of PyMca v4.7.1