No merge conflict please
Merge branch 'master' of https://github.com/psoshnin/mirror-quickstart-python
Changes