Brought changes from the trunk to the branch:

svn merge -r25432:25629 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran