Merge branch 'sbt-build-fix' of https://github.com/cheeseng/scalatest
Merge branch 'master' of https://github.com/scalatest/scalatest