merge develop -Dnone -Ibreaking -Eexclude -Sno-error

Repository: ome/scripts
Excluded PRs:
  # PR 94 will-moore 'Make Movie script handles units for scalebar' (user: will-moore)
Already up-to-date.

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