Ahem.
Merge pull request #227 from tobie/ci-cleanup

Ahem.