4.2.1.final patch

This lives in another package as per its folder.