Fixed dependencies
Merge pull request #3955 from GrahamCampbell/4.2-deps

[4.2] Dependency Fixes (Updated)