Merge branch 'web-socket-channel' into 0.12.11+x

Closes #401