Merge "Update wikimedia/timestamp to v2.2.0"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 24 Sep 2018 20:50:14 +0000 (20:50 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 24 Sep 2018 20:50:14 +0000 (20:50 +0000)

Trivial merge