Imported Upstream version 3.5
Imported Debian patch 3.5-1