Merge branch 'debian-release-0.3' into debian-develop