Forward-port Debian patches to 2.39.