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

diff --git a/test/files/neg/t3481.check b/test/files/neg/t3481.check
index 48e6ff357b..debe07275b 100644
--- a/test/files/neg/t3481.check
+++ b/test/files/neg/t3481.check
@@ -1,17 +1,17 @@
 t3481.scala:5: error: type mismatch;
  found   : String("hello")
- required: _$1 where type +_$1
+ required: _$1
     f[A[Int]]("hello")
               ^
 t3481.scala:11: error: type mismatch;
- found   : _$2 where type +_$2
+ found   : _$2
  required: b.T
     (which expands to)  _$2
     def f[T <: B[_]](a: T#T, b: T) = b.m(a)
                                          ^
 t3481.scala:12: error: type mismatch;
  found   : String("Hello")
- required: _$2 where type +_$2
+ required: _$2
     f("Hello", new B[Int])
       ^
 t3481.scala:18: error: type mismatch;