Merge branch 'master' into feature/collection-concurrent

Conflicts:
	src/library/scala/collection/JavaConversions.scala
	src/library/scala/collection/JavaConverters.scala

Add one test for concurrent map conversion.

1 files changed, 12 insertions, 0 deletions

diff --git a/test/pending/pos/t5626.scala b/test/pending/pos/t5626.scala
new file mode 100644
index 0000000000..7ab3881827
--- /dev/null
+++ b/test/pending/pos/t5626.scala
@@ -0,0 +1,12 @@
+object Test {
+  val blob0 = new {
+    case class Foo(i : Int)
+  }
+  val foo0 = blob0.Foo(22)
+
+  val blob1 = new {
+    class Foo(i: Int)
+    object Foo { def apply(i: Int): Foo = new Foo(i) }
+  }
+  val foo1 = blob1.Foo(22)
+}