Merge branch 'develop' into issue/1276
authorMaksim Pechnikov <parallel588@gmail.com>
Thu, 31 Oct 2019 18:09:46 +0000 (21:09 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Thu, 31 Oct 2019 18:09:46 +0000 (21:09 +0300)

Trivial merge