client user-session association
Merge remote-tracking branch 'upstream/master'
Merge pull request #393 from patriot1burke/master

user-session client association