Fix merge error - ping_timeout=2 -> ping_timeout=6
Add to changelog