Merge branch 'develop' into issue/941
authorMaksim Pechnikov <parallel588@gmail.com>
Tue, 4 Jun 2019 12:06:58 +0000 (15:06 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Tue, 4 Jun 2019 12:06:58 +0000 (15:06 +0300)

Trivial merge