A little more generic, a little love.
Merge remote-tracking branch 'bsmedberg/distribution-checker' into distribution-checker