Merge 2.12 2.13#175

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

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