Merge remote-tracking branch 'upstream/master' into fork_sync

src/main/java/bdv/img/cache/VolatileGlobalCellCache.java

src/main/java/bdv/img/catmaid/CatmaidImageLoader.java

...n/java/bdv/img/catmaid/CatmaidVolatileIntArrayLoader.java

src/main/java/bdv/img/catmaid/XmlIoCatmaidImageLoader.java

src/main/java/bdv/img/hdf5/DimsAndExistence.java

src/main/java/bdv/img/hdf5/HDF5Access.java

src/main/java/bdv/img/hdf5/HDF5AccessHack.java

src/main/java/bdv/img/hdf5/Hdf5ImageLoader.java

src/main/java/bdv/img/hdf5/Hdf5VolatileShortArrayLoader.java

src/main/java/bdv/img/hdf5/IHDF5Access.java

src/main/java/bdv/img/hdf5/MipmapInfo.java

src/main/java/bdv/img/hdf5/Partition.java

src/main/java/bdv/img/hdf5/Util.java

src/main/java/bdv/img/hdf5/ViewLevelId.java

src/main/java/bdv/img/hdf5/XmlIoHdf5ImageLoader.java

src/main/java/bdv/img/imaris/DataTypes.java

src/main/java/bdv/img/imaris/HDF5AccessHack.java

src/main/java/bdv/img/imaris/IHDF5Access.java

src/main/java/bdv/img/imaris/Imaris.java

src/main/java/bdv/img/imaris/ImarisImageLoader.java