Bringing sbt branch up to date.