Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Wed, 5 Jul 2017 23:13:59 +0000 (02:13 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 5 Jul 2017 23:13:59 +0000 (02:13 +0300)

Trivial merge