Imported Upstream version 2.2.1
Merge branch 'upstream' into launchpad