Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
	attributes/default.rb
	recipes/default.rb
	templates/default/server.xml.erb