thirdshift 0.20.6

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