Work around OSX make environment issues.
Merge branch 'osx-make'
Fix a duplicate slashes regression.