Merge branch '16-t-varop-mm' into 21-manual
change to R-admin, eg, take out obsolete comments on OS X and Windows
Merge branch '21-manual' into 23