Merge branch 'develop' of https://github.com/openmicroscopy/bioformats into openmicroscopy-develop

Conflicts:
	components/formats-gpl/src/loci/formats/in/NativeND2Reader.java
Merge branch 'openmicroscopy-develop' into develop