Imported Upstream version 1.8.24
Imported Debian patch 1.8.24-1ubuntu2