merge develop -D org

Repository: ome/scripts
Updating b78c468..1878321
Merged PRs (fast-forward):
  # PR 69 will-moore 'Kymograph analysis march 12th'

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