Merge branch '30-bison' into 31
remove R_FunTab_gram... refs from names.c
Merge branch '30-bison' into 31
Merge branch '30-bison' into 31-kalibera
Merge branch '31' into 31-kalibera
Revert "remove R_FunTab_gram... refs from names.c"

This reverts commit 765a2305a6a7a32dcb0478dc4ace397ce17f5dc0.
Merge branch '30-bison' into 31-kalibera