Merge branch 'sbt-13' of https://github.com/cheeseng/scalatest
Merge branch 'lazy-msg-6' of https://github.com/cheeseng/scalatest