Cherry-picked all parser changes from 1.0.
Merge branch 'origin/master'