merge develop -D org

Repository: ome/scripts
Updating 25a0869..491d96e
Merged PRs (fast-forward):
  # PR 76 will-moore 'Fix 'No permissions' error in Make_Movie.py. See #12227'

Generated by OMERO-5.1-merge-push#270 (http://ci.openmicroscopy.org/job/OMERO-5.1-merge-push/270/)