Merge 2.12 to 2.13#234

lrytz merged 4 commits intoscala:2.13.xscala/scala-dist:2.13.xfrom

lrytz:merge-212lrytz/scala-dist:merge-212Copy head branch name to clipboard