Imported Upstream version 1.2
Merge tag 'upstream/1.2' into debian-debian

Upstream version 1.2