Merge "Sync up with Parsoid parserTests."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 23 Feb 2016 20:45:38 +0000 (20:45 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 23 Feb 2016 20:45:38 +0000 (20:45 +0000)

Trivial merge