merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/bioformats
Updating 03770c0..6bbd9b7

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