Merge branch 'master' into update/mockito-3-4-3.2.5.0

Author: SethTisue

project/Dependencies.scala

@@ -3,7 +3,7 @@ import sbt._
 object Version {
   val logback   = "1.2.3"
   val mockito   = "3.2.5.0"
-  val scalaTest = "3.2.4"
+  val scalaTest = "3.2.5"
   val slf4j     = "1.7.30"
 }