commit from mini
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebSocketSample/sample3.html