fix for issue where associations are not populated in socket updates
Merge remote-tracking branch 'origin/master'