Merge pull request #3074 from mfournier/ci-setup