Merge branch 'develop' into issue/1276
authorMaksim Pechnikov <parallel588@gmail.com>
Wed, 30 Oct 2019 20:07:18 +0000 (23:07 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Wed, 30 Oct 2019 20:07:18 +0000 (23:07 +0300)

Trivial merge