Merge "Sync up with Parsoid parserTests."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 1 Jul 2016 14:45:23 +0000 (14:45 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 1 Jul 2016 14:45:23 +0000 (14:45 +0000)

Trivial merge