Merge commit '9cdbe28' into merge/2.10.x-to-master

Conflicts:
	build.examples.xml
	build.xml
	docs/examples/actors/pingpong.scala
	docs/examples/fors.scala
	docs/examples/iterators.scala
	docs/examples/jolib/Ref.scala
	docs/examples/jolib/parallelOr.scala
	docs/examples/monads/callccInterpreter.scala
	docs/examples/monads/directInterpreter.scala
	docs/examples/monads/errorInterpreter.scala
	docs/examples/monads/simpleInterpreter.scala
	docs/examples/monads/stateInterpreter.scala
	docs/examples/parsing/ArithmeticParser.scala
	docs/examples/patterns.scala
	docs/examples/pilib/elasticBuffer.scala
	docs/examples/pilib/handover.scala
	docs/examples/pilib/piNat.scala
	docs/examples/typeinf.scala
	src/build/pack.xml

1 files changed, 11 insertions, 0 deletions

diff --git a/test/files/pos/t8060.scala b/test/files/pos/t8060.scala
new file mode 100644
index 0000000000..90e014d74b
--- /dev/null
+++ b/test/files/pos/t8060.scala
@@ -0,0 +1,11 @@
+trait M[F[_]]
+ 
+trait P[A] {
+  type CC[X] = P[X]
+  def f(p: A => Boolean): M[CC]
+}
+ 
+trait Other {
+  // was infinite loop trying to dealias `x$1.CC`
+  def g[A](p: A => Boolean): P[A] => M[P] = _ f p
+}