Merge in changes from the r-forge branch to prepare its removal