Imported Upstream version 3.1.13
Imported Debian patch 3.1.13-2