Merge branch 'develop' into issue/1383
authorMaksim Pechnikov <parallel588@gmail.com>
Wed, 4 Dec 2019 13:31:45 +0000 (16:31 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Wed, 4 Dec 2019 13:31:45 +0000 (16:31 +0300)

Trivial merge