Merge "OOjs UI: Backport aadaa8a1, 9aba218a"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 13 Oct 2015 14:27:04 +0000 (14:27 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 13 Oct 2015 14:27:04 +0000 (14:27 +0000)

Trivial merge