Commits
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop) * commit '5b9f3660d7419fde023e3f277fb8f7d742fa255e': Reworked the previously refactorred code. Improvement of test code
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop) * commit '5b9f3660d7419fde023e3f277fb8f7d742fa255e': Reworked the previously refactorred code. Improvement of test code