merge dev_5_0 -D org: PR 998 (Micromanager fixes)
merge dev_5_0 -D org: PR 1018 (Flex: fix support for new file naming scheme)
merge dev_5_0 -D org

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1045 imunro 'Changes to ensure pmtMarker is read correctly.' (label: exclude)
  # PR 1016 ctrueden 'Use pom-scijava as parent' (label: exclude)
Updating f1dbd98..d69c368
Merged PRs (fast-forward):
  # PR 1052 rleigh-dundee 'xsd-fu: Remove continued line inside genshi conditionals (rebased)'

Merged PRs:
  # PR 998 melissalinkert 'Micromanager fixes'
  # PR 1018 melissalinkert 'Flex: fix support for new file naming scheme'

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