Commits
Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_8) * commit '3e7fa85fd9f22fbca6661b473586f208b4b32f7f': Add bugfix from PR 2049 to hdf5_1_8
Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_8) * commit '3e7fa85fd9f22fbca6661b473586f208b4b32f7f': Add bugfix from PR 2049 to hdf5_1_8