thirdshift 0.36.0

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