Imported Upstream version 1.1