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

# Conflicts:
#	build/sandcastle/SSH.NET.shfbproj

build/sandcastle/SSH.NET.shfbproj

@@ -36,7 +36,7 @@
   <outputPaths>{@HelpFormatOutputPaths}</outputPaths>
   <allowMissingSource value="false" />
   <removeRegionMarkers value="false" />
-  <colorizer syntaxFile="{@SHFBROOT}PresentationStyles\Colorizer\highlight.xml" styleFile="{@SHFBROOT}PresentationStyles\Colorizer\highlight.xsl" stylesheet="{@SHFBROOT}PresentationStyles\Colorizer\highlight.css" scriptFile="{@SHFBROOT}PresentationStyles\Colorizer\highlight.js" disabled="{@DisableCodeBlockComponent}" language="cs" tabSize="0" numberLines="false" outlining="false" keepSeeTags="false" defaultTitle="true" />
+  <colorizer syntaxFile="{@SHFBROOT}\PresentationStyles\Colorizer\highlight.xml" styleFile="{@SHFBROOT}\PresentationStyles\Colorizer\highlight.xsl" stylesheet="{@SHFBROOT}\PresentationStyles\Colorizer\highlight.css" scriptFile="{@SHFBROOT}\PresentationStyles\Colorizer\highlight.js" disabled="{@DisableCodeBlockComponent}" language="cs" tabSize="0" numberLines="false" outlining="false" keepSeeTags="false" defaultTitle="true" />
 </component>
       </ComponentConfig>
     </ComponentConfigurations>

src/Renci.SshNet/SshClient.cs

@@ -261,7 +261,7 @@ namespace Renci.SshNet
         /// <remarks>This method internally uses asynchronous calls.</remarks>
         /// <example>
         ///     <code source="..\..\src\Renci.SshNet.Tests\Classes\SshCommandTest.cs" region="Example SshCommand RunCommand Result" language="C#" title="Running simple command" />
-        ///     <code source="..\..\src\Renci.SshNet.Tests\Classes\SshCommandTest.NET40.cs" region="Example SshCommand RunCommand Parallel" language="C#" title="Run many commands in parallel" />
+        ///     <code source="..\..\src\Renci.SshNet.Tests\Classes\SshCommandTest..cs" region="Example SshCommand RunCommand Parallel" language="C#" title="Run many commands in parallel" />
         /// </example>
         /// <exception cref="ArgumentException">CommandText property is empty.</exception>
         /// <exception cref="T:Renci.SshNet.Common.SshException">Invalid Operation - An existing channel was used to execute this command.</exception>