Merge remote-tracking branch 'origin/master' into metacollin/master

Library/Homebrew/cask.rb

Library/Homebrew/cask/audit.rb

Library/Homebrew/cask/cmd/fetch.rb

Library/Homebrew/cask/cmd/zap.rb

Library/Homebrew/cask/download.rb

Library/Homebrew/cask/dsl.rb

Library/Homebrew/cask/exceptions.rb

Library/Homebrew/cask/installer.rb

Library/Homebrew/cask/verify.rb

Library/Homebrew/checksum.rb

Library/Homebrew/cli/args.rb

Library/Homebrew/cli/named_args.rb

Library/Homebrew/cmd/fetch.rb

Library/Homebrew/cmd/info.rb

Library/Homebrew/cmd/uninstall.rb

Library/Homebrew/dev-cmd/edit.rb

Library/Homebrew/exceptions.rb

...y/Homebrew/extend/os/mac/requirements/java_requirement.rb

Library/Homebrew/formula_installer.rb

Library/Homebrew/resource.rb