Merge branch 'master' into Lyberta/KillSound
authorLyberta <lyberta@lyberta.net>
Sun, 3 Sep 2017 22:11:11 +0000 (01:11 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 3 Sep 2017 22:11:11 +0000 (01:11 +0300)

Trivial merge