partially fulfil PR#16808

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

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

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