Merge "Revert and fix "Revert "EditPage: Show EditFilterMergedContent hook errors...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 26 Jan 2018 18:01:45 +0000 (18:01 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 26 Jan 2018 18:01:45 +0000 (18:01 +0000)

Trivial merge