Imported Upstream version 1.12
Imported Debian patch 1.12-0.2