Merge branch 'cb/makefile-apple-clang' into maint