Merge "Fix return type for html strings"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 6 Apr 2018 23:56:18 +0000 (23:56 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 6 Apr 2018 23:56:18 +0000 (23:56 +0000)

Trivial merge