Commits
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop) * commit 'a01ac97ba509e51905b816e8a29b5d0b2bc8be87': Fix incorrect FUNC_LEAVE macro (should match FUNC_ENTER_*_TAG).
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop) * commit 'a01ac97ba509e51905b816e8a29b5d0b2bc8be87': Fix incorrect FUNC_LEAVE macro (should match FUNC_ENTER_*_TAG).