Merge branch stable into master

Author: michaelklishin

dist.sh

@@ -157,7 +157,6 @@ function src-dist {
     cp -r projects tmp/srcdist/
     rm -f tmp/srcdist/projects/README
     cp -r docs/specs/*.xml tmp/srcdist/docs/specs/
-    cp -r lib/nunit tmp/srcdist/lib/
     cp README.in tmp/srcdist/README
     if [ -n "$NO_LINKS" ]; then
         touch tmp/srcdist/README

projects/client/Unit/src/unit/TestHeartbeats.cs

@@ -94,7 +94,7 @@ public void TestThatHeartbeatWriterWithTLSEnabled()
             RunSingleConnectionTest(cf);
         }
 
-        [Test, Category("LongRunning"), MaxTimeAttribute(65000)]
+        [Test, Category("LongRunning"), MaxTimeAttribute(90000)]
         public void TestHundredsOfConnectionsWithRandomHeartbeatInterval()
         {
             var rnd = new Random();