To latest from Jison, passing all tests
Merge remote-tracking branch 'origin/1.x' into 1.x