Commits
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop) * commit 'f3a4e8164f99d733e6804acddfe1b3b0dfe63634': remove unnecessary stuff squash cast warning fix
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop) * commit 'f3a4e8164f99d733e6804acddfe1b3b0dfe63634': remove unnecessary stuff squash cast warning fix