Merge "Update CREDITS"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 7 May 2017 17:09:46 +0000 (17:09 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 7 May 2017 17:09:46 +0000 (17:09 +0000)

Trivial merge