Merge branch 'hotfix-0.14.5' into debian-hotfix-0.14.5-wheezy