Fix #658: socket:read() incorrectly handles size and delimiter together
Merge branch 'stable'

Conflicts:
	test/box/bsdsocket.result
	test/box/bsdsocket.test