Imported Upstream version 1.66