Imported Upstream version 1.6