[sr-dev] git:master:3b2f7ce0: Merge pull request #724 from phil-lavin/bugfix-presence-race