Merge FabianM/homebrew:master with Homebrew/homebrew:master