Merge branch 'develop' into issue/1023
authorMaksim Pechnikov <parallel588@gmail.com>
Wed, 22 Jul 2020 06:24:16 +0000 (09:24 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Wed, 22 Jul 2020 06:24:16 +0000 (09:24 +0300)

Trivial merge