Merge "Localisation, minior cleanup, minor changes"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 31 Jul 2016 22:56:15 +0000 (22:56 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 31 Jul 2016 22:56:15 +0000 (22:56 +0000)

Trivial merge