Subject: [PATCH] fixes for handling multiple protocols in handshake
Merge remote-tracking branch 'upstream/master'