Commits

Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10) * commit 'b077040516e4091e98777818292fe8fbc38e9f12': Merge from develop
Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10) * commit 'b077040516e4091e98777818292fe8fbc38e9f12': Merge from develop