Merge "Remove "@author Aaron Schulz" annotations"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 27 Jun 2017 22:39:10 +0000 (22:39 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 27 Jun 2017 22:39:10 +0000 (22:39 +0000)

Trivial merge