Retag as 4.2.0r1 because it's still based on the 4.2.0 branch