Merge branch 'develop' into issue/733
authorMaksim Pechnikov <parallel588@gmail.com>
Tue, 17 Sep 2019 19:20:39 +0000 (22:20 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Tue, 17 Sep 2019 19:20:39 +0000 (22:20 +0300)

Trivial merge