Merge branch 'maint' into yacc-work