merge dev_5_0 -D org

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1223 melissalinkert 'Ask Travis to retry failed builds' (status: error)
Already up-to-date.

Generated by OME-5.0-merge-push#125 (http://ci.openmicroscopy.org/job/OME-5.0-merge-push/125/)