Imported Upstream version 1.0+hg1340