Fix #424: Merge socket:read() and socket:readline()
Merge remote-tracking branch 'origin/gh-424-socket-readline' into stable
Merge remote-tracking branch 'origin/stable'

Conflicts:
	test/box/fiber.result
	test/box/fiber.test
Merge branch 'stable'

Conflicts:
	test/box/bsdsocket.result
	test/box/bsdsocket.test
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/box/fiber.result
	test/box/fiber.test.lua