Merge branch 'master' into Lyberta/KillSound
authorLyberta <lyberta@lyberta.net>
Sat, 2 Dec 2017 15:53:28 +0000 (18:53 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 2 Dec 2017 15:53:28 +0000 (18:53 +0300)

Trivial merge