Pull in develop and update to compile

Curtis, Does this achieve what was wanted for PR https://github.com/openmicroscopy/bioformats/pull/351 ?