Merge branch 'master' into add_socket_proxy_type

Conflicts:
	recipes/default.rb