Use correct versions
Merge remote-tracking branch 'upstream/master'

Conflicts:
	project/Build.scala