Merge "Preferences: Fix issues from 6d3c65b5b0"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 4 Sep 2015 04:41:44 +0000 (04:41 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 4 Sep 2015 04:41:44 +0000 (04:41 +0000)

Trivial merge