scalaVersion update
Merge branch 'master' into play23

Conflicts:
	build.sbt