merge develop -D org: PR 76 (Fix 'No permissions' error in Make_Movie.py. See #12227)
merge develop -D org: PR 81 (Make movie format time 12254 (rebased onto develop))
merge develop -D org

Repository: ome/scripts
Updating 31f89c4..7361669
Merged PRs (fast-forward):
  # PR 79 sbesson 'Travis fix (rebased onto develop)'

Merged PRs:
  # PR 76 will-moore 'Fix 'No permissions' error in Make_Movie.py. See #12227'
  # PR 81 will-moore 'Make movie format time 12254 (rebased onto develop)'

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