Merge pull request #807 from micmac1/ci-up