Merge branch 'master' into Lyberta/RandomStartWeapons
authorLyberta <lyberta@lyberta.net>
Sat, 2 Sep 2017 06:33:18 +0000 (09:33 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 2 Sep 2017 06:33:18 +0000 (09:33 +0300)

Trivial merge