Merge branch 'FindHDF5-restore-default-C' into release