Merge commit '9cdbe28' into merge/2.10.x-to-master

Conflicts:
	build.examples.xml
	build.xml
	docs/examples/actors/pingpong.scala
	docs/examples/fors.scala
	docs/examples/iterators.scala
	docs/examples/jolib/Ref.scala
	docs/examples/jolib/parallelOr.scala
	docs/examples/monads/callccInterpreter.scala
	docs/examples/monads/directInterpreter.scala
	docs/examples/monads/errorInterpreter.scala
	docs/examples/monads/simpleInterpreter.scala
	docs/examples/monads/stateInterpreter.scala
	docs/examples/parsing/ArithmeticParser.scala
	docs/examples/patterns.scala
	docs/examples/pilib/elasticBuffer.scala
	docs/examples/pilib/handover.scala
	docs/examples/pilib/piNat.scala
	docs/examples/typeinf.scala
	src/build/pack.xml

1 files changed, 16 insertions, 0 deletions

diff --git a/test/files/run/t7912.scala b/test/files/run/t7912.scala
new file mode 100644
index 0000000000..3d603e0e97
--- /dev/null
+++ b/test/files/run/t7912.scala
@@ -0,0 +1,16 @@
+case object A { override def toString = ??? }
+
+object Test {
+  def foo: Int = (A: Any) match {
+    case 0 => 0
+  }
+  def main(args: Array[String]): Unit = {
+    try {
+      foo
+      sys.error("no exception")
+    } catch {
+      case me: MatchError => assert(me.getMessage == "an instance of class A$", me.getMessage)
+      case ex: Throwable => sys.error("not a match error: " + ex.getClass)
+    }
+  }
+}