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

Repository: openmicroscopy/bioformats
Updating 03770c0..f8af208

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