merge develop --exclude conflict needs-fixes broken: PR 17 (Figure scripts tiff 10000 develop)
merge develop --exclude conflict needs-fixes broken

Repository: ome/scripts
Updating 457e85a..80884ad
Merged PRs:
  # PR 17 jburel 'Figure scripts tiff 10000 develop'

Generated by OMERO-merge-develop#98 (http://hudson.openmicroscopy.org.uk/job/OMERO-merge-develop/98/)