Merge branch 'master' into remove-augmentString

Author: seoethereal

scalatags/test/src/scalatags/generic/StyleSheetTests.scala

@@ -85,7 +85,6 @@ abstract class StyleSheetTests[Builder, Output <: FragT, FragT]
 
 
   def check(txt: String, expected: String) = {
-    // augmentString = work around scala/bug#11125 on JDK 11
     def normalize(s: String) = s.linesIterator.map(_.trim).mkString
 
     assert(normalize(txt) == normalize(expected))