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, 3 insertions, 3 deletions

diff --git a/test/files/continuations-neg/trycatch2.scala b/test/files/continuations-neg/trycatch2.scala
index d61419169b..d329a3b530 100644
--- a/test/files/continuations-neg/trycatch2.scala
+++ b/test/files/continuations-neg/trycatch2.scala
@@ -12,7 +12,7 @@ object Test {
     fatal[Int]
     cpsIntStringInt
   } catch {
-    case ex =>
+    case ex: Throwable =>
       cpsIntStringInt
   }
 
@@ -20,7 +20,7 @@ object Test {
     fatal[Int]
     cpsIntStringInt
   } catch {
-    case ex =>
+    case ex: Throwable =>
       cpsIntStringInt
   }
 
@@ -30,4 +30,4 @@ object Test {
     println(reset { foo2; "3" })
   }
 
-}
\ No newline at end of file
+}