merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 359 (License updates (dev_4_4) + obsolete code removal)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/bioformats
Updating 03770c0..6bbd9b7
Merged PRs:
  # PR 359 ctrueden 'License updates (dev_4_4) + obsolete code removal'

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