Merge branch 'master' into execution-context

Conflicts:
	src/library/scala/package.scala

1 files changed, 14 insertions, 0 deletions

diff --git a/test/pending/pos/t5400.scala b/test/pending/pos/t5400.scala
new file mode 100644
index 0000000000..cb4be4bde5
--- /dev/null
+++ b/test/pending/pos/t5400.scala
@@ -0,0 +1,14 @@
+trait TFn1B {
+  type In
+  type Out
+  type Apply[T <: In] <: Out
+}
+
+trait TFn1[I, O] extends TFn1B {
+  type In = I
+  type Out = O
+}
+
+trait >>[F1 <: TFn1[_, _], F2 <: TFn1[_, _]] extends TFn1[F1#In, F2#Out] {
+  type Apply[T] = F2#Apply[F1#Apply[T]]
+}