merge dev_5_0 -D org

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1122 melissalinkert 'Update POM version numbers to 5.0.2' (label: exclude)
Already up-to-date.

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