thirdshift 0.20.5

Turn a GitHub issue into a ready-for-review pull request, unattended