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

diff --git a/test/files/run/t1994.scala b/test/files/run/t1994.scala
new file mode 100644
index 0000000000..0b463e3444
--- /dev/null
+++ b/test/files/run/t1994.scala
@@ -0,0 +1,20 @@
+class A {
+  protected def x = 0
+  protected[A] def y = 0
+}
+ 
+class B extends A {
+  override def x = 1
+  def superY = super[A].y
+  override def y = 1
+}
+
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    val b = new B
+    assert(b.x == 1)
+    assert(b.y == 1)
+    assert(b.superY == 0)
+  }
+}