Update debian-develop branch with debian-release-0.4