Merge "Sync up with Parsoid parserTests."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 21 Oct 2015 12:55:34 +0000 (12:55 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 21 Oct 2015 12:55:34 +0000 (12:55 +0000)

Trivial merge