Imported Upstream version 6.5p1
Imported Debian patch 1:6.5p1-4