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

1.x