Merge pull request #3602 from jmarshallnz/broken_vs_deps