Merge remote-tracking branch 'origin/master' into handle-not-being-edge-proxy

Conflicts:
	sprout/stateful_proxy.cpp