Commits
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop) * commit '40bf112b56c90b7e90c9ec3d7a35a78d1d12288b': Trivialities noticed while merging things to 1.10
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop) * commit '40bf112b56c90b7e90c9ec3d7a35a78d1d12288b': Trivialities noticed while merging things to 1.10