Merge "Reduce usage of inline <span style="white-space: nowrap">"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 19 Nov 2015 21:32:44 +0000 (21:32 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 19 Nov 2015 21:32:44 +0000 (21:32 +0000)

Trivial merge