Imported Debian patch 1.5.0-3ubuntu0.3