merge develop --exclude conflict needs-fixes broken: PR 556 (FS-lite file security)
merge develop --exclude conflict needs-fixes broken: PR 577 (9821 Major FS refactoring)
merge develop --exclude conflict needs-fixes broken

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 556 joshmoore 'FS-lite file security'
  # PR 577 joshmoore '9821 Major FS refactoring'

Repository: openmicroscopy/bioformats
Updating 96c615b..d634ee8
Merged PRs:
  # PR 317 melissalinkert 'Add support for Inveon data'
  # PR 319 melissalinkert 'Add support for JPEG-2000 compression with code 34712'
  # PR 320 melissalinkert 'ImageJ plugin option improvements'
  # PR 326 joshmoore 'Sprint 4 bug fixes (rebased onto develop)'
Conflicting PRs (not included):
  # PR 329 melissalinkert 'Sort original metadata keys ending with an index'

Repository: ome/scripts
Updating 457e85a..272c83a

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

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