Merge pull request #403 from tartley/fix-ci

Fix CI