Allow setting local_host
Merge remote-tracking branch 'origin/master' into expose-to-from

Conflicts:
	lib/endpoint.rb