Merge branch 'master' into Lyberta/TeamplayOverhaul
authorLyberta <lyberta@lyberta.net>
Fri, 8 Jun 2018 14:37:48 +0000 (17:37 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 8 Jun 2018 14:37:48 +0000 (17:37 +0300)

Trivial merge