Merge branch 'develop' into issue/1023
authorMaksim Pechnikov <parallel588@gmail.com>
Thu, 16 Jul 2020 05:53:21 +0000 (08:53 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Thu, 16 Jul 2020 05:53:21 +0000 (08:53 +0300)

Trivial merge