Correcting grammatically-incorrect error message
Unifying error message from I18N text
Merge branch 'master' into scala-2.11
upgrade to latest parser-combinators library

it has some bugfixes, probably not relevant to us, but hey