Merge "Update wikimedia/timestamp to v2.2.0"