Merge branch 'develop' into gun
authorAlexander Strizhakov <alex.strizhakov@gmail.com>
Mon, 16 Mar 2020 11:35:27 +0000 (14:35 +0300)
committerAlexander Strizhakov <alex.strizhakov@gmail.com>
Mon, 16 Mar 2020 11:35:27 +0000 (14:35 +0300)

Trivial merge