Imported Upstream version 3.1.12
Imported Debian patch 3.1.12-1