Fix homebrew conditional
Merge branch 'refs/heads/upstream'