Merge remote-tracking branch 'origin/master' into test

Conflicts:
	run.sh
	stop.sh
Merge branch 'test' of https://github.com/luckyan315/sio_benchmark into test

Conflicts:
	run.sh
	stop.sh