Merge "Fix type annotation"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 17 Dec 2016 01:29:08 +0000 (01:29 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 17 Dec 2016 01:29:08 +0000 (01:29 +0000)

Trivial merge