Merge remote-tracking branch 'origin/master'

Conflicts:
	Library/Formula/gobby.rb
	Library/Formula/net6.rb
	Library/Formula/obby.rb