andrewmile Merge pull request #377 from tighten/shift-ci-v9.11.0