.
fixed regressions in plugin version
fixed regression
More changes
Merge remote-tracking branch 'origin/jeremy/fixnginx'

Conflicts:
	recipes/proxy.rb