Imported Upstream version 6.6p1
Imported Debian patch 1:6.6p1-3