Merge branch 'master' into Lyberta/TeamplayOverhaul
authorLyberta <lyberta@lyberta.net>
Sat, 14 Jul 2018 13:37:06 +0000 (16:37 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 14 Jul 2018 13:37:06 +0000 (16:37 +0300)

Trivial merge