merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 363 (Backport of PR #305 to 4.4)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/bioformats
Updating 85a55ab..0dfbe90
Merged PRs:
  # PR 363 rleigh-dundee 'Backport of PR #305 to 4.4'

Generated by OMERO-merge-stable#149 (http://hudson.openmicroscopy.org.uk/job/OMERO-merge-stable/149/)