Commits
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop) * commit 'f5da9b1befeb81aa9f4d97df3ec606f801807420': Minor changes from normalization with 1.10
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop) * commit 'f5da9b1befeb81aa9f4d97df3ec606f801807420': Minor changes from normalization with 1.10