Darlene Merge

Clear out conflicts in pull request of darlene-scaladoc-for-scalatest-08 (https://github.com/scalatest/scalatest/pull/201).