Fix Content Pipeline build errors on OS X
Merge pull request #1582 from kylewlacy/develop

Fix Content Pipeline build errors on OS X