Commits

Merging in latest from upstream (HDFFV/hdf5:refs/heads/doxygen) * commit 'aaee7405213b8ef9840a41084b483369b4600741': Updated TODO items.
Merging in latest from upstream (HDFFV/hdf5:refs/heads/doxygen) * commit 'aaee7405213b8ef9840a41084b483369b4600741': Updated TODO items.