Reverted update to broken Scala 2.11.3.
Merge branch 'master' into scala-2.10.x

Conflicts:
	project/Build.scala