Merge pull request #2593 from rust-lang/tshepang/testing-with-ci

Merge pull request #2593 from rust-lang/tshepang/testing-with-ci #5582