Merge branch 'patch-1' of https://github.com/ReubenBond/mono into ReubenBond-patch-1

diff --cc mcs/class/System/System.Net.WebSockets/ClientWebSocket.cs
index d7e999c46f36b4624cea92e5ad32c920a791308b,c903720f24d7d231dfeb48b71658b439470279d5..ff011d2f93044da4f6f28a9a7966e2800004572d
--- 1/mcs/class/System/System.Net.WebSockets/ClientWebSocket.cs
--- 2/mcs/class/System/System.Net.WebSockets/ClientWebSocket.cs
+++ b/mcs/class/System/System.Net.WebSockets/ClientWebSocket.cs
@@@ -315,10 -279,10 +315,10 @@@ namespace System.Net.WebSocket
  
                int WriteHeader (WebSocketMessageType type, ArraySegment<byte> buffer, bool endOfMessage)
                {
 -                      var opCode = (byte)type;
 +                      var opCode = MessageTypeToWire (type);
                        var length = buffer.Count;
  
-                       headerBuffer[0] = (byte)(opCode | (endOfMessage ? 0 : 0x80));
+                       headerBuffer[0] = (byte)(opCode | (endOfMessage ? 0x80 : 0));
                        if (length < 126) {
                                headerBuffer[1] = (byte)length;
                        } else if (length <= ushort.MaxValue) {

diff --cc mcs/class/System/Test/System.Net.WebSockets/ClientWebSocketTest.cs
Simple merge