merge develop --exclude conflict needs-fixes broken: PR 556 (FS-lite file security)
merge develop --exclude conflict needs-fixes broken: PR 573 (Figure scripts (rebased onto develop))
merge develop --exclude conflict needs-fixes broken

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 556 joshmoore 'FS-lite file security'
  # PR 573 joshmoore 'Figure scripts (rebased onto develop)'

Repository: openmicroscopy/bioformats
Updating 96c615b..25bef48
Merged PRs:
  # PR 317 melissalinkert 'Add support for Inveon data'
  # PR 318 melissalinkert 'PR 201 on develop'
  # PR 319 melissalinkert 'Add support for JPEG-2000 compression with code 34712'
  # PR 320 melissalinkert 'ImageJ plugin option improvements'
  # PR 321 melissalinkert 'Sprint3 bug fixes develop'
  # PR 323 sbesson 'Extlinks review (rebased onto develop)'
  # PR 325 sbesson 'Return Bio-Formats version in bfCheckJavaPath() (rebased onto develop)'

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

Repository: openmicroscopy/ome-documentation
Updating 2e32665..bc8e28f

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