Merge "Underscores etc. aren't valid in HTML IDs, so escape them properly"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 4 May 2015 20:12:48 +0000 (20:12 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 4 May 2015 20:12:48 +0000 (20:12 +0000)

Trivial merge