Merge pull request #897 from TheBlueMatt/2021-04-fix-ci