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