Merge 2.10.x into master

Conflicts:
	src/compiler/scala/tools/nsc/typechecker/Duplicators.scala
	src/library/scala/concurrent/Future.scala
	test/files/jvm/scala-concurrent-tck.scala

1 files changed, 12 insertions, 0 deletions

diff --git a/test/files/run/t7571.scala b/test/files/run/t7571.scala
new file mode 100644
index 0000000000..00b9695168
--- /dev/null
+++ b/test/files/run/t7571.scala
@@ -0,0 +1,12 @@
+class Foo(val a: Int) extends AnyVal {
+  def foo = { {case x => x + a}: PartialFunction[Int, Int]}
+
+  def bar = (new {}).toString
+}
+
+object Test extends App {
+  val x = new Foo(1).foo.apply(2)
+  assert(x == 3, x)
+  val s = new Foo(1).bar
+  assert(s.nonEmpty, s)
+}