Imported Upstream version 2.2