Integrate changes from the 1.4.2 release