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: PR 367 (.cxd dimension detection fixes)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/bioformats
Updating 3f142f7..ff2c150
Merged PRs:
  # PR 363 rleigh-dundee 'Backport of PR #305 to 4.4'
  # PR 367 melissalinkert '.cxd dimension detection fixes'

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