Imported Upstream version 1.1.20rev1
Imported Upstream version 1.1.21
Merge tag 'upstream/1.1.21'

Upstream version 1.1.21
Update Debian changelog to version 1.1.21-1.