improved parse error reporting format
Merge branch 'origin/bill'

* refs/remotes/origin/bill:
  improved parse error reporting format