Commits
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop) * commit 'e9e3e2f1d67ccf71cc5af711065d1f85761ab5b7': Refactor to reduce verbosity.
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop) * commit 'e9e3e2f1d67ccf71cc5af711065d1f85761ab5b7': Refactor to reduce verbosity.