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

diff --git a/test/files/pos/t6051.scala b/test/files/pos/t6051.scala
new file mode 100644
index 0000000000..854524feb9
--- /dev/null
+++ b/test/files/pos/t6051.scala
@@ -0,0 +1,19 @@
+object Foo1 {
+  def foo(x: Int, y: Int = 10) = x*y
+  lazy val y = foo(x = 20)
+}
+
+object Foo2 {
+  def foo(x: Int, y: Int = 10) = x*y
+  val y = foo(x = 20)
+}
+
+object Foo3 {
+  def foo(x: Int, y: Int = 10) = x*y
+  def y = foo(x = 20)
+}
+
+object Foo4 {
+  def foo(x: Int, y: Int = 10) = x*y
+  var y = foo(x = 20)
+}