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, 12 insertions, 0 deletions

diff --git a/test/files/run/t4950.scala b/test/files/run/t4950.scala
new file mode 100644
index 0000000000..cef06027bf
--- /dev/null
+++ b/test/files/run/t4950.scala
@@ -0,0 +1,12 @@
+import scala.tools.partest.ReplTest
+
+object Test extends ReplTest {
+  // Filter out the abbreviated stacktrace "... X elided" 
+  // because the number seems to differ between versions/platforms/...
+  override def show = eval() filterNot (_ contains "elided") foreach println
+  def code =
+"""
+val 1 = 2
+val List(1) = List(1)
+"""
+}