improving ci tools.
Merge pull request #2760 from sebv/improved-ci

Improving ci tools.