Imported Debian patch 1.1.7-4ubuntu0.12.04.1