Merge remote-tracking branch 'kali/hotfix/fix-manifest'
Merge remote-tracking branch 'kali/bug/fix-couch-dep'
Merge branch 'release-0.3.2'
Update requirements
Fold in changes
Merge branch 'release-0.3.3'