Merge branch 'future-scala-collector'