master
Merge branch 'master' into pr_282
Add setKeepAlive function and tests
Reenable all keepalive tests