Merge branch 'master' into topic/parser

Conflicts:
	core/src/main/scala/scala/reflect/core/Trees.scala
	project/build.scala
	tests/test/Basic.scala