Commits

Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10) * commit '2ee65646c3afb31194864d36a20817c44b42e677': Merge pull request #1224 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop
Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10) * commit '2ee65646c3afb31194864d36a20817c44b42e677': Merge pull request #1224 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop