Merge pull request #1051 from JosephGoulden/fix_ping_disconnect