Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
	conf/haproxy.cfg.json
	run.sh