Merge remote-tracking branch 'origin/2.10.x' into merge/v2.10.1-235-g4525e92-to-master

Conflicts:
	bincompat-backward.whitelist.conf
	bincompat-forward.whitelist.conf
	src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
	src/compiler/scala/tools/nsc/typechecker/Typers.scala
	src/reflect/scala/reflect/internal/Types.scala

2 files changed, 17 insertions, 0 deletions

diff --git a/test/pending/run/t6387.check b/test/pending/run/t6387.check
new file mode 100644
index 0000000000..83b33d238d
--- /dev/null
+++ b/test/pending/run/t6387.check
@@ -0,0 +1 @@
+1000
diff --git a/test/pending/run/t6387.scala b/test/pending/run/t6387.scala
new file mode 100644
index 0000000000..bbebb5f511
--- /dev/null
+++ b/test/pending/run/t6387.scala
@@ -0,0 +1,16 @@
+trait A {
+  def foo: Long
+}
+
+object Test {
+  def a(): A = new A {
+    var foo: Long = 1000L
+
+    val test = () => {
+      foo = 28
+    }
+  }
+  def main(args: Array[String]) {
+    println(a().foo)
+  }
+}