Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Fri, 7 Apr 2017 13:14:16 +0000 (16:14 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 7 Apr 2017 13:14:16 +0000 (16:14 +0300)

Trivial merge