Merge pull request #1 from wikimedia/master

Sync with WMF repo
Merge pull request #2 from wikimedia/master

Sync with WMF repo
Update README.md