Merge remote-tracking branch 'origin/master' into morosophos/rankings_cnt
authorNick Savchenko <nsavch@gmail.com>
Mon, 4 Jun 2018 20:57:17 +0000 (23:57 +0300)
committerNick Savchenko <nsavch@gmail.com>
Mon, 4 Jun 2018 20:57:17 +0000 (23:57 +0300)

Trivial merge