Imported Upstream version 2.0