Use ANTLR 3.4, we'll just wait for 4.0 next.
Merge branch 'master' into ubuntu-12