Merge branch 'vendor/BYACC'