Imported Debian patch 7.22.0-3ubuntu4.8