Merge branch '2.10.x'

Conflicts:
	src/compiler/scala/tools/nsc/doc/Settings.scala
	src/compiler/scala/tools/nsc/interpreter/CompletionOutput.scala
	src/compiler/scala/tools/nsc/matching/Patterns.scala
	src/compiler/scala/tools/nsc/transform/UnCurry.scala
	src/compiler/scala/tools/nsc/typechecker/Infer.scala
	src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala
	src/compiler/scala/tools/nsc/typechecker/Typers.scala
	src/reflect/scala/reflect/internal/settings/MutableSettings.scala
	src/reflect/scala/reflect/runtime/Settings.scala
	src/swing/scala/swing/SwingActor.scala
	src/swing/scala/swing/SwingWorker.scala
	test/files/run/t6955.scala