Better handling of timeouts for pings.
Merge branch 'test' into dev
library bump.