Imported Upstream version 3.2.2.1
Merge tag 'upstream/3.2.2.1' into debian

Upstream version 3.2.2.1