Fixed to ensure correct version
Merge branch 'feature/2.10-support' into develop

Conflicts:
	project/Dependencies.scala