This should speed up Travis builds.
Merge branch 'master' into two-pass-parsing