thirdshift 0.18.5

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