Merge branch 'master' of https://github.com/highfidelity/hifi
Merge branch 'master' of https://github.com/highfidelity/hifi
fix for delayed heartbeats, late socket lookup
Merge pull request #3891 from birarda/master

fix for delayed domain-server heartbeats
Merge branch 'master' of https://github.com/highfidelity/hifi into tot