Merge pull request #1 from Homebrew/master

rebase