merge dev_5_0 -D org: PR 998 (Micromanager fixes)
merge dev_5_0 -D org: PR 1025 (Update POM version numbers to 5.0.2-SNAPSHOT)
merge dev_5_0 -D org

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1033 melissalinkert 'Add the series index to the default image name' (status: )
  # PR 1024 melissalinkert 'DICOM: fix file grouping so that path names are normalized' (label: exclude)
  # PR 1016 ctrueden 'Use pom-scijava as parent' (label: exclude)
  # PR 1018 melissalinkert 'Flex: fix support for new file naming scheme' (label: exclude)
Already up-to-date.

Merged PRs:
  # PR 998 melissalinkert 'Micromanager fixes'
  # PR 1025 melissalinkert 'Update POM version numbers to 5.0.2-SNAPSHOT'

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