Merge branch '2.10.x' into master

* 2.10.x: (51 commits)
  improved/fixed reflection docs based on comments
  Fixes SI-6354: improved error messages for Dynamic signature mismatches.
  Add RedBlackTree tests for take/drop/slice.
  Retain Ordering in drop/take/slice signatures.
  test case closes SI-5770
  clarify caveats of App trait
  Remove `@static` annotation from the library.
  New starr that does not depend on `@static`.
  improved reflection documentation
  pull request feedback
  SI-5692 better error message
  SI-5942 toolboxes now reset front ends
  SI-6287 fixes synthetic symbol clashes in toolbox
  Revert "Implement @static annotation on singleton object fields."
  Revert "WIP add private/lazy checks and a few tests."
  Revert "Fixes SI-6189."
  Revert "Fixes SI-6236."
  Revert "Fix SI-4581."
  Revert "Fix SI-6294."
  refactors java reflection tests
  ...

Conflicts:
	src/compiler/scala/tools/nsc/typechecker/Typers.scala
	src/partest/scala/tools/partest/package.scala
	src/reflect/scala/reflect/internal/Trees.scala

1 files changed, 1 insertions, 1 deletions

diff --git a/src/library/scala/collection/immutable/List.scala b/src/library/scala/collection/immutable/List.scala
index d3402e16a2..83da68eb68 100644
--- a/src/library/scala/collection/immutable/List.scala
+++ b/src/library/scala/collection/immutable/List.scala
@@ -229,7 +229,7 @@ sealed abstract class List[+A] extends AbstractSeq[A]
    *  }}}
    */
   override def slice(from: Int, until: Int): List[A] = {
-    val lo = math.max(from, 0)
+    val lo = scala.math.max(from, 0)
     if (until <= lo || isEmpty) Nil
     else this drop lo take (until - lo)
   }