Imported Upstream version 1.4