Merge branch 'master' into Lyberta/DebugPrintToChat
authorLyberta <lyberta@lyberta.net>
Sun, 2 Apr 2017 16:01:59 +0000 (19:01 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 2 Apr 2017 16:01:59 +0000 (19:01 +0300)

Trivial merge