Imported Upstream version 1.9