Imported Upstream version 6.5p1