init merge
Merge remote-tracking branch 'upstream/master'
updated client for new authentication protocol