Merge "Fix function annotiation"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 4 Nov 2017 21:07:46 +0000 (21:07 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 4 Nov 2017 21:07:46 +0000 (21:07 +0000)

Trivial merge