Bug fix in antlr, see sf bug #179
Merge branch 'dev' into v1.2.4