Merge remote-tracking branch 'antlr/master' into optimized