Fixes #3311
Merge pull request #3314 from aaronschachter/services_make

Restores peace and happiness to DS build