Merge remote-tracking branch 'scala/2.10.x' into merge-2.10.x

Conflicts:
	build.number
	test/files/neg/classmanifests_new_deprecations.check