merge dev_5_0 -D org

Repository: ome/scripts
Updating d1f6aae..80f1ec1
Merged PRs (fast-forward):
  # PR 77 will-moore 'Make movie format time 12254'
  # PR 78 sbesson 'Travis fix'

Generated by OMERO-5.0-merge-daily#659 (http://ci.openmicroscopy.org/job/OMERO-5.0-merge-daily/659/)