distro dep tidy up
Merge pull request #1908 from andytaylor/master

distro dep tidy up