Merge "Upgrade wikimedia/timestamp to 2.0.0"