adding changes from dropbox/antrl4-patched