other crypto bugs
Merge commit '5989257'

Conflicts:
	src/cowboy_http_websocket.erl
	src/cowboy_websocket.erl