TODO: Port 2.10.x's #2247 to master.

Test are failing.

Conflicts:
	src/compiler/scala/tools/nsc/typechecker/Typers.scala
Merge 2.10.x's #2253 into master.

Conflicts:
	src/compiler/scala/tools/nsc/typechecker/Typers.scala
Merge 2.10.x's #2255 into master.
TODO: Merge 2.10.x's #2269 into master.

NPE while compiling test/files/neg/t7259.scala

Conflicts:
	src/compiler/scala/tools/nsc/typechecker/Typers.scala
Merge 2.10.x's #2261 into master

Conflicts:
	test/files/run/t6223.check
	test/files/run/t6223.scala
Merge 2.10.x's #2283 into master.

Conflicts:
	src/reflect/scala/reflect/runtime/JavaUniverse.scala
Merge 2.10.x's #2276 into master.
Merge 2.10.x's #2245 into master.
Merge 2.10.x's #2268 into master.

Conflicts:
	src/compiler/scala/reflect/reify/utils/Extractors.scala
Merge 2.10.x's #2274 into master.
Merge 2.10.x's #2264 into master.

Conflicts:
	src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
Merge 2.10.x's #2295 into master.

Conflicts:
	build.xml