Release version 2.2.1
Merge branch 'master' into debian
Release 2.2.1