Merge tag 'upstream/1.3' into debian

Upstream version 1.3
Imported Upstream version 1.3
Changelog for v1.3
Imported Upstream version 1.4
Merge tag 'upstream/1.4' into debian

Upstream version 1.4
Changelog for v1.4