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

diff --git a/test/files/jvm/scala-concurrent-tck.scala b/test/files/jvm/scala-concurrent-tck.scala
index ba7dffbcb0..75e2b92ff6 100644
--- a/test/files/jvm/scala-concurrent-tck.scala
+++ b/test/files/jvm/scala-concurrent-tck.scala
@@ -13,7 +13,7 @@ import scala.concurrent.promise
 import scala.concurrent.blocking
 import scala.util.{ Try, Success, Failure }
 
-import scala.util.Duration
+import scala.concurrent.util.Duration
 
 
 trait TestBase {
@@ -74,7 +74,7 @@ trait FutureCallbacks extends TestBase {
       done()
       throw new Exception
     }
-    f onSuccess { 
+    f onSuccess {
       case _ => assert(false)
     }
   }