Merge release 1.20.1 into 1.21.x#226

Ocramius merged 2 commits into1.21.xlaminas/automatic-releases:1.21.xfrom

1.20.x-merge-up-into-1.21.x_rTzdnpqclaminas/automatic-releases:1.20.x-merge-up-into-1.21.x_rTzdnpqcCopy head branch name to clipboard