merge develop -D none -I breaking -E exclude

Repository: ome/scripts
Excluded PRs:
  # PR 79 sbesson 'Travis fix (rebased onto develop)' (user: sbesson)
  # PR 76 will-moore 'Fix 'No permissions' error in Make_Movie.py. See #12227' (user: will-moore)
Already up-to-date.

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