Fix for ANTLR warning.
Merge branch '1.3.x'