To create a patched version of bioformats cherry pick those commits.

No commits that need to be patched~