Imported Upstream version 1.64