Merge remote-tracking branch 'kali/hotfix/add_manifest_license'
Merge branch 'release-0.3.2'
Fix changelog

The last entries for common really belonged to 0.3.1
Fold in changes.
Merge branch 'release-0.4.0'