Merge remote-tracking branch 'upstream/master' into smartos-changes-merging-upstream

Conflicts:
	attributes/default.rb
	definitions/nginx_site.rb