Merge branch 'master' of https://github.com/mono/mono into issue4328

Conflicts:
	mcs/class/System/Test/System.Collections.Generic/SortedListTest.cs

diff --cc mcs/class/System/System.Collections.Generic/SortedList.cs
Simple merge

diff --cc mcs/class/System/Test/System.Collections.Generic/SortedListTest.cs
index fa9eedb1b15eca0c6a62413b9b0338a52e1a9240,dcacc78373d7c0efb80cdcc18c6f221903c86327..4ecaba16d467d10d6053b9b74c2c08936ebc79f2
--- 1/mcs/class/System/Test/System.Collections.Generic/SortedListTest.cs
--- 2/mcs/class/System/Test/System.Collections.Generic/SortedListTest.cs
+++ b/mcs/class/System/Test/System.Collections.Generic/SortedListTest.cs
@@@ -464,18 -464,45 +464,58 @@@ namespace MonoTests.System.Collections.
                        Assert.IsTrue(sl.Keys[2] == 3, "NCIC #D3");
                }
  
 +              [Test]
 +              public void ClearDoesNotTouchCapacity ()
 +              {
 +                      SortedList<int, int> sl = new SortedList<int, int> ();
 +                      for (int i = 0; i < 18; i++) {
 +                              sl.Add (i, i);
 +                      }
 +                      int capacityBeforeClear = sl.Capacity;
 +                      sl.Clear ();
 +                      int capacityAfterClear = sl.Capacity;
 +                      Assert.AreEqual (capacityBeforeClear, capacityAfterClear);
 +              }
++
+               class Uncomparable : IComparer<double>
+               {
+                       public int Compare (double x, double y)
+                       {
+                               throw new DivideByZeroException ();
+                       }
+               }
+ 
+               [Test]
+               // Bug #4327
+               public void UncomparableList ()
+               {
+                       var list = new SortedList<double, int> (new Uncomparable ());
+ 
+                       list.Add (Math.PI, 1);
+ 
+                       try {
+                               list.Add (Math.E, 2);
+                               Assert.Fail ("UC #1");
+                       } catch (Exception ex) {
+                               Assert.IsInstanceOfType (
+                                       typeof (InvalidOperationException), ex, "UC #2");
+                               Assert.That (ex.InnerException != null, "UC #3");
+                               Assert.IsInstanceOfType (
+                                       typeof (DivideByZeroException), ex.InnerException, "UC #4");
+                       }
+ 
+                       try {
+                               int a;
+                               list.TryGetValue (Math.E, out a);
+                               Assert.Fail ("UC #5");
+                       } catch (Exception ex) {
+                               Assert.IsInstanceOfType (
+                                       typeof (InvalidOperationException), ex, "UC #5");
+                               Assert.That (ex.InnerException != null, "UC #6");
+                               Assert.IsInstanceOfType (
+                                       typeof (DivideByZeroException), ex.InnerException, "UC #7");
+                       }
+               }
        }
  }