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, 34 insertions, 0 deletions

diff --git a/test/files/run/t4809.scala b/test/files/run/t4809.scala
new file mode 100644
index 0000000000..b30d80562f
--- /dev/null
+++ b/test/files/run/t4809.scala
@@ -0,0 +1,34 @@
+
+
+import scala.util.control.Breaks._
+
+
+
+object Test {
+  
+  def main(args: Array[String]) {
+    val x = tryBreakable {
+      break
+      2
+    } catchBreak {
+      3
+    }
+    assert(x == 3, x)
+    
+    val y = tryBreakable {
+      2
+    } catchBreak {
+      3
+    }
+    assert(y == 2, y)
+    
+    val z = tryBreakable {
+      break
+      1.0
+    } catchBreak {
+      2
+    }
+    assert(z == 2.0, z)
+  }
+  
+}