merge develop --exclude conflict needs-fixes broken: PR 305 (LIFReader: Add User-Comment tags to the series metadata)
merge develop --exclude conflict needs-fixes broken: PR 317 (Add support for Inveon data)
merge develop --exclude conflict needs-fixes broken: PR 319 (Add support for JPEG-2000 compression with code 34712)
merge develop --exclude conflict needs-fixes broken: PR 320 (ImageJ plugin option improvements)
merge develop --exclude conflict needs-fixes broken: PR 325 (Return Bio-Formats version in bfCheckJavaPath() (rebased onto develop))
merge develop --exclude conflict needs-fixes broken: PR 326 (Sprint 4 bug fixes (rebased onto develop))
merge develop --exclude conflict needs-fixes broken

Repository: openmicroscopy/bioformats
Updating 96c615b..bf12f46
Merged PRs:
  # PR 305 rleigh-dundee 'LIFReader: Add User-Comment tags to the series metadata'
  # 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 325 sbesson 'Return Bio-Formats version in bfCheckJavaPath() (rebased onto develop)'
  # PR 326 joshmoore 'Sprint 4 bug fixes (rebased onto develop)'

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