Merge branch 'master' into issue/5846,4597,4027,4112

Conflicts:
	src/library/scala/collection/MapLike.scala
	src/library/scala/collection/SortedMapLike.scala

1 files changed, 15 insertions, 0 deletions

diff --git a/test/files/neg/t2442/t2442.scala b/test/files/neg/t2442/t2442.scala
new file mode 100644
index 0000000000..b0a0f3cd41
--- /dev/null
+++ b/test/files/neg/t2442/t2442.scala
@@ -0,0 +1,15 @@
+class Test {
+  import MyEnum._
+
+  def f(e: MyEnum) = e match {
+    case ONE => println("one")
+    case TWO => println("two")
+    // missing case --> exhaustivity warning!
+  }
+
+  import MySecondEnum._
+  def g(e: MySecondEnum) = e match {
+    case RED => println("red")
+    // missing case --> exhaustivity warning!
+  }
+}
\ No newline at end of file