Imported Upstream version 3.3.0.18
Imported Debian patch 3.3.0.18-2