Fixes for Mac OS X and parallel compilation
Merge pull request #568 from hantwister/bleeding-jumbo

Fixes for Mac OS X and parallel compilation