Merge branch 'master' into Lyberta/RandomItems
authorLyberta <lyberta@lyberta.net>
Tue, 24 Oct 2017 20:02:44 +0000 (23:02 +0300)
committerLyberta <lyberta@lyberta.net>
Tue, 24 Oct 2017 20:02:44 +0000 (23:02 +0300)

Trivial merge