merge dev_5_0 -D org: PR 915 (Fix for single channel  meas_mode 13 data.)
merge dev_5_0 -D org: PR 946 (Read internal pyramids from CellSens .vsi data)
merge dev_5_0 -D org: PR 951 (Fix up Bio-Formats POMs)
merge dev_5_0 -D org: PR 952 (Memoization fixes)
merge dev_5_0 -D org: PR 957 (Correctly set Modulo annotations for multi-Image datasets (rebased onto dev_5_0))
merge dev_5_0 -D org: PR 958 (Flex: be more permissive in parsing IFDs and XML (rebased onto dev_5_0))
merge dev_5_0 -D org: PR 960 (Cache OME-XML between ImagePluses (rebased onto dev_5_0))
merge dev_5_0 -D org: PR 968 (Cellomics: a few fixes for single-file datasets (rebased onto dev_5_0))
merge dev_5_0 -D org: PR 972 (CZI: restrict dimension adjustment)
merge dev_5_0 -D org

Repository: openmicroscopy/bioformats
Already up-to-date.

Merged PRs:
  # PR 915 imunro 'Fix for single channel  meas_mode 13 data.'
  # PR 946 melissalinkert 'Read internal pyramids from CellSens .vsi data'
  # PR 951 ctrueden 'Fix up Bio-Formats POMs'
  # PR 952 melissalinkert 'Memoization fixes'
  # PR 957 melissalinkert 'Correctly set Modulo annotations for multi-Image datasets (rebased onto dev_5_0)'
  # PR 958 melissalinkert 'Flex: be more permissive in parsing IFDs and XML (rebased onto dev_5_0)'
  # PR 960 melissalinkert 'Cache OME-XML between ImagePluses (rebased onto dev_5_0)'
  # PR 968 melissalinkert 'Cellomics: a few fixes for single-file datasets (rebased onto dev_5_0)'
  # PR 972 melissalinkert 'CZI: restrict dimension adjustment'
Conflicting PRs (not included):
  # PR 971 chris-allan 'Scope test dependencies in specification component properly'

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