Merge remote-tracking branch 'origin/master' into morosophos/rankings_cnt 558/head
authorMorosophos <ahcie0op@yandex.ru>
Thu, 7 Jun 2018 19:46:03 +0000 (22:46 +0300)
committerMorosophos <ahcie0op@yandex.ru>
Thu, 7 Jun 2018 19:46:03 +0000 (22:46 +0300)

Trivial merge