rename .g to .y (yacc-style)
Merge branch 'g-y'