Merge pull request #413 from euanh/master

Fix (mostly Debian) build breakage