Kingfisher

8f928de0 - Merge pull request #2240 from onevcat/fix/ci-matrix