Imported Debian patch 2.20.1-5.7