Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20160517

 Conflicts:
	build.sbt
	test/files/run/repl-javap-app.check
	test/files/run/repl-javap-app.scala

1 files changed, 22 insertions, 0 deletions

diff --git a/test/files/run/repl-classbased.scala b/test/files/run/repl-classbased.scala
new file mode 100644
index 0000000000..595e123159
--- /dev/null
+++ b/test/files/run/repl-classbased.scala
@@ -0,0 +1,22 @@
+
+import scala.tools.partest.ReplTest
+import scala.tools.nsc.Settings
+
+//SI-9740
+object Test extends ReplTest {
+  override def transformSettings(s: Settings): Settings = {
+    s.Yreplclassbased.value = true
+    s
+  }
+
+  def code = 
+    """
+case class K(s: String)
+class C { implicit val k: K = K("OK?"); override def toString = s"C($k)" }
+val c = new C
+import c.k
+implicitly[K]
+val k = 42
+k                 // was K(OK?)
+    """
+}