Updating from upstream to 1.4.2