Merge branch 'master' of github.com:wikimedia/kraken
Merge branch 'master' of github.com:wikimedia/kraken