Merge branch '2.10.x' into topic/merge-v2.10.2-RC1-35-ga54d86b-to-master

Conflicts:
	src/partest/scala/tools/partest/DirectTest.scala

1 files changed, 13 insertions, 0 deletions

diff --git a/test/files/run/t6481.scala b/test/files/run/t6481.scala
new file mode 100644
index 0000000000..125da3b15a
--- /dev/null
+++ b/test/files/run/t6481.scala
@@ -0,0 +1,13 @@
+abstract class foo(a: Int, b: Int) extends scala.DelayedInit {
+  def delayedInit(x: => Unit) {
+    println("delayed init");
+    x
+  }
+}
+
+object Test {
+  def main(args: Array[String]) {
+    new foo(1, 2) { println("new foo(1, 2)") }
+    new foo(b = 2, a = 1) { println("new foo(b = 2, a = 1)") }
+  }
+}