Commits

Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10) * commit '3049d2c140b06d5b2b419562c3d4d1d1c66612e3': A minor bug fix.
Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10) * commit '3049d2c140b06d5b2b419562c3d4d1d1c66612e3': A minor bug fix.