Merge branch 'develop' into issue/1218
authorMaksim Pechnikov <parallel588@gmail.com>
Sat, 7 Sep 2019 19:17:32 +0000 (22:17 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Sat, 7 Sep 2019 19:17:32 +0000 (22:17 +0300)

Trivial merge