Merge branch 'maint' With some edits to `tests/defs' and `ChangeLog', to reflect the fact that in master we already had a `yacc' requirement, and no more had an explicitly-recognized `bison' requirement.