Update to the latest release of ANTLR 4
Merge branch 'sharpen'
Fix build errors in newly generated code