Merge branch '21-scalars' into 23-applydefine
change use of R_set_Slot to go with other revisions
Merge branch '23-applydefine' into 25-from-2.15.1