https://angela.zipwhip.com/issues/15720: PingFuture not getting cleared in all cases
Merge remote-tracking branch 'origin/master'