Merge pull request #850 from mcnewton/patch-dpkg