Commits
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop) * commit '59a4ffac402cc4d96ec43b0027f9ac30ad7b0527': removed always true ifdef
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop) * commit '59a4ffac402cc4d96ec43b0027f9ac30ad7b0527': removed always true ifdef