Imported Upstream version 2.1