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

 Conflicts:
 	scripts/jobs/integrate/bootstrap
 	src/build/maven/scala-actors-pom.xml
 	test/files/pos/t3420.flags

Conflicts were trivial to resolve.

9 files changed, 17 insertions, 18 deletions

diff --git a/src/build/genprod.scala b/src/build/genprod.scala
index b470348e8c..f85a151ae5 100644
--- a/src/build/genprod.scala
+++ b/src/build/genprod.scala
@@ -15,7 +15,6 @@ import scala.language.postfixOps
  *      where the argument is the desired output directory
  *
  *  @author  Burak Emir, Stephane Micheloud, Geoffrey Washburn, Paul Phillips
- *  @version 1.1
  */
 object genprod extends App {
   val MAX_ARITY = 22
@@ -353,7 +352,7 @@ object ProductTwo extends Product(2)
 
 class Product(val i: Int) extends Group("Product") with Arity {
   val productElementComment = """
-  /** Returns the n-th projection of this product if 0 < n <= productArity,
+  /** Returns the n-th projection of this product if 0 <= n < productArity,
    *  otherwise throws an `IndexOutOfBoundsException`.
    *
    *  @param n number of the projection to be returned
diff --git a/src/build/maven/scala-compiler-doc-pom.xml b/src/build/maven/scala-compiler-doc-pom.xml
index 8572e55b42..0c33d23d61 100644
--- a/src/build/maven/scala-compiler-doc-pom.xml
+++ b/src/build/maven/scala-compiler-doc-pom.xml
@@ -51,8 +51,8 @@
       <name>EPFL LAMP</name>
     </developer>
     <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
+      <id>Lightbend</id>
+      <name>Lightbend, Inc.</name>
     </developer>
   </developers>
 </project>
diff --git a/src/build/maven/scala-compiler-interactive-pom.xml b/src/build/maven/scala-compiler-interactive-pom.xml
index ad8192b694..d3e5e0b834 100644
--- a/src/build/maven/scala-compiler-interactive-pom.xml
+++ b/src/build/maven/scala-compiler-interactive-pom.xml
@@ -41,8 +41,8 @@
       <name>EPFL LAMP</name>
     </developer>
     <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
+      <id>Lightbend</id>
+      <name>Lightbend, Inc.</name>
     </developer>
   </developers>
 </project>
diff --git a/src/build/maven/scala-compiler-pom.xml b/src/build/maven/scala-compiler-pom.xml
index 8ca18f6f14..15546109c8 100644
--- a/src/build/maven/scala-compiler-pom.xml
+++ b/src/build/maven/scala-compiler-pom.xml
@@ -63,8 +63,8 @@
       <name>EPFL LAMP</name>
     </developer>
     <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
+      <id>Lightbend</id>
+      <name>Lightbend, Inc.</name>
     </developer>
   </developers>
 </project>
diff --git a/src/build/maven/scala-dist-pom.xml b/src/build/maven/scala-dist-pom.xml
index 1f6b6710ac..ce511661b0 100644
--- a/src/build/maven/scala-dist-pom.xml
+++ b/src/build/maven/scala-dist-pom.xml
@@ -62,8 +62,8 @@
       <name>EPFL LAMP</name>
     </developer>
     <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
+      <id>Lightbend</id>
+      <name>Lightbend, Inc.</name>
     </developer>
   </developers>
 </project>
diff --git a/src/build/maven/scala-library-all-pom.xml b/src/build/maven/scala-library-all-pom.xml
index 074c067742..4620c620dc 100644
--- a/src/build/maven/scala-library-all-pom.xml
+++ b/src/build/maven/scala-library-all-pom.xml
@@ -61,8 +61,8 @@
       <name>EPFL LAMP</name>
     </developer>
     <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
+      <id>Lightbend</id>
+      <name>Lightbend, Inc.</name>
     </developer>
   </developers>
 </project>
diff --git a/src/build/maven/scala-library-pom.xml b/src/build/maven/scala-library-pom.xml
index 78fc05a7c3..e27f8fb12f 100644
--- a/src/build/maven/scala-library-pom.xml
+++ b/src/build/maven/scala-library-pom.xml
@@ -39,8 +39,8 @@
       <name>EPFL LAMP</name>
     </developer>
     <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
+      <id>Lightbend</id>
+      <name>Lightbend, Inc.</name>
     </developer>
   </developers>
 </project>
diff --git a/src/build/maven/scala-reflect-pom.xml b/src/build/maven/scala-reflect-pom.xml
index c21caefcf2..f7f3c8bc08 100644
--- a/src/build/maven/scala-reflect-pom.xml
+++ b/src/build/maven/scala-reflect-pom.xml
@@ -44,8 +44,8 @@
       <name>EPFL LAMP</name>
     </developer>
     <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
+      <id>Lightbend</id>
+      <name>Lightbend, Inc.</name>
     </developer>
   </developers>
 </project>
diff --git a/src/build/maven/scalap-pom.xml b/src/build/maven/scalap-pom.xml
index 236ac999fc..acdd44f19b 100644
--- a/src/build/maven/scalap-pom.xml
+++ b/src/build/maven/scalap-pom.xml
@@ -41,8 +41,8 @@
       <name>EPFL LAMP</name>
     </developer>
     <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
+      <id>Lightbend</id>
+      <name>Lightbend, Inc.</name>
     </developer>
   </developers>
 </project>