protect/unprotect fixes from Tomas Kalibera via R Core
fixes to protect fixes in tcltk
Merge branch '31-kalibera' into 32
Merge branch '31-cleanup' into 32
fixes
Merge branch '31-cleanup' into 32