Merge "Update wikimedia/timestamp to v2.1.1"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 10 Sep 2018 21:26:42 +0000 (21:26 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 10 Sep 2018 21:26:42 +0000 (21:26 +0000)

Trivial merge