Updated to support the latest homebrew master merge changes.