merge develop -D org

Repository: ome/scripts
Updating 9f8a7a0..9771f00
Merged PRs (fast-forward):
  # PR 88 mtbc 'Image from roi (rebased from dev_5_0)'

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