Imported Debian patch 1.10+dfsg~beta1-2ubuntu0.5