port from branch (!!)

git-svn-id: https://svn.r-project.org/R/trunk@66570 00db46b3-68df-0310-9c12-caf00c1e9a41