Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:

#	src/Renci.SshNet.Tests/Classes/Messages/Connection/ChannelRequest/PseudoTerminalInfoTest.cs

.gitattributes

@@ -2,10 +2,10 @@
 
 *.cs text
 *.xaml text
-*.sln text eol=crlf
-*.csproj text eol=crlf
-*.shproj text eol=crlf
-*.appxmanifest text eol=crlf
+*.sln eol=crlf
+*.csproj eol=crlf
+*.shproj eol=crlf
+*.appxmanifest eol=crlf
 
 *.png binary
 *.jpg binary

README.md

@@ -3,6 +3,7 @@ SSH.NET
 SSH.NET is a Secure Shell (SSH) library for .NET, optimized for parallelism.
 
 [![Version](https://img.shields.io/nuget/vpre/SSH.NET.svg)](https://www.nuget.org/packages/SSH.NET)
+[![Build status](https://ci.appveyor.com/api/projects/status/ih77qu6tap3o92gu/branch/develop?svg=true)](https://ci.appveyor.com/api/projects/status/ih77qu6tap3o92gu/branch/develop)
 
 ##Introduction
 This project was inspired by **Sharp.SSH** library which was ported from java and it seems like was not supported for quite some time. This library is a complete rewrite, without any third party dependencies, using parallelism to achieve the best performance possible.

src/Renci.SshNet.Tests/Classes/Messages/Connection/ChannelRequest/PseudoTerminalInfoTest.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -61,7 +61,6 @@ namespace Renci.SshNet.Tests.Classes.Messages.Connection
             var sshDataStream = new SshDataStream(bytes);
 
             Assert.AreEqual(1, sshDataStream.ReadByte()); // WantReply
-//            Assert.AreEqual((uint) _environmentVariableBytes.Length, sshDataStream.ReadUInt32());
             Assert.AreEqual(environmentVariable, sshDataStream.ReadString(Encoding.UTF8));
             Assert.AreEqual(columns, sshDataStream.ReadUInt32());
             Assert.AreEqual(rows, sshDataStream.ReadUInt32());

src/Renci.SshNet/Messages/Connection/ChannelRequest/PseudoTerminalInfo.cs

@@ -132,7 +132,7 @@ namespace Renci.SshNet.Messages.Connection
             Write(EnvironmentVariable);
             Write(Columns);
             Write(Rows);
-            Write(Rows);
+            Write(PixelWidth);
             Write(PixelHeight);
 
             if (TerminalModeValues != null)