Synch and logging
Merge branch 'upstream'
Merge branch 'master' of https://github.com/Razharas/-tg-station