Merge pull request #1549 from mfournier/socket-keepalive