Fix the Mono and OSX builds#4273

Merged

dsyme merged 7 commits intodotnet:masterfrom

dsyme:osx-fixes

Jan 29, 2018

Commits on Jan 26, 2018

fix build.sh for OSX and a little cleanup
dsyme
committed

Commits on Jan 29, 2018

Merge branch 'master' into osx-fixes
dsyme
authored