Imported Upstream version 3.4
Imported Debian patch 3.4-4build1