Following upstream
Merge branch 'master' of https://github.com/nradulovic/meerkat