Merge branch 'patmat-refactor' into patmat-refactor-master

Conflicts:
	src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala