merge dev_5_0 -D org: PR 951 (Fix up Bio-Formats POMs)
merge dev_5_0 -D org: PR 972 (CZI: restrict dimension adjustment)
merge dev_5_0 -D org: PR 987 (Volocity: parse timestamps from .atsf files)
merge dev_5_0 -D org: PR 998 (Micromanager fixes)
merge dev_5_0 -D org: PR 1000 (Metadata fixes)
merge dev_5_0 -D org: PR 1003 (Large fileset performance improvements)
merge dev_5_0 -D org: PR 1009 (TIFF: adjust optimal tile height if tiles have height of 1)
merge dev_5_0 -D org

Repository: openmicroscopy/bioformats
Updating 9d09347..cf6580b
Merged PRs (fast-forward):
  # PR 989 melissalinkert 'ND2: always set the field index to 2'

Merged PRs:
  # PR 951 ctrueden 'Fix up Bio-Formats POMs'
  # PR 972 melissalinkert 'CZI: restrict dimension adjustment'
  # PR 987 melissalinkert 'Volocity: parse timestamps from .atsf files'
  # PR 998 melissalinkert 'Micromanager fixes'
  # PR 1000 melissalinkert 'Metadata fixes'
  # PR 1003 melissalinkert 'Large fileset performance improvements'
  # PR 1009 melissalinkert 'TIFF: adjust optimal tile height if tiles have height of 1'

Generated by OMERO-5.0-merge-daily#616 (http://ci.openmicroscopy.org/job/OMERO-5.0-merge-daily/616/)