[sr-dev] git:master:5ebbe8dc: Merge pull request #726 from phil-lavin/bugfix-presence-race-2