Copy from OS X branch.
No prof.
Merge branch 'arafura' into arafura-ci4osx