Merge branch 'fix-old-cmake-builds' into swiftype-master
Merge branch 'pr-fix-macos-build' into swiftype-master