Merge "Several minor fixes."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 28 Feb 2013 20:42:15 +0000 (20:42 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 28 Feb 2013 20:42:15 +0000 (20:42 +0000)

Trivial merge