Merge commit '7ba38a0' into merge/2.11.x-to-2.12.x-20150129

Conflicts:
	build.number
	src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala
	src/library/scala/collection/Iterator.scala
	versions.properties

1 files changed, 31 insertions, 0 deletions

diff --git a/test/files/pos/t8962.scala b/test/files/pos/t8962.scala
new file mode 100644
index 0000000000..4331c154ba
--- /dev/null
+++ b/test/files/pos/t8962.scala
@@ -0,0 +1,31 @@
+package test.nestedcov
+
+sealed abstract class Outer[+A]
+case class Let[+A](expr: Outer[Inner[A]]) extends Outer[A]
+
+sealed abstract class Inner[+A]
+
+sealed abstract class Outer2[+A, +B]
+case class Let2[+A](expr: Outer2[Inner2[A], A]) extends Outer2[A, A]
+
+sealed abstract class Inner2[+A]
+
+sealed abstract class Outer3[+A, +B]
+case class Let3[+A](expr: Outer3[A, A]) extends Outer3[A, A]
+
+object NestedCov {
+  def run[A](nc: Outer[A]) = nc match {
+    case Let(expr) =>
+      expr : Outer[Inner[A]]
+  }
+
+  def run2[A](nc: Outer2[A, A]) = nc match {
+    case Let2(expr) =>
+      expr : Outer2[Inner2[A], A]
+  }
+
+  def run3[A](nc: Outer3[A, A]) = nc match {
+    case Let3(expr) =>
+      expr : Outer3[A, A]
+  }
+}