hdf5

Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)

* commit '10535e0376d88e218cab782322bfc06f35835f31':
  Reset the other convenience pointer because why no
  Fixed a memory bug where a pointer is used after it's been freed.