Merge branch 'hotfix-0.4.4' into debian-hotfix-0.4.4