Merge "Update wikimedia/timestamp to v2.1.1"