Imported Upstream version 6.6p1