Merge pull request #3011 from akoeplinger/ci-fixes