Merge branch '1.4.2-windows-fixes' into v1.4