Intermediate commit
Merge branch 'master' of https://github.com/Judzhin/ms-slim