bumping to next dev version.
Merge branch 'sbt-13' into 1.4.x

Conflicts:
	project/Build.scala