Fix subprotocols

Broken by b1dee9478815b22bf5fee3ee9e44321d4bb46c91
Merge pull request #402 from julien-f/patch-1

Fix subprotocols
Merge remote-tracking branch 'upstream/master'