Merge branch 'develop' into fix/config-gen-releases
authorrinpatch <rinpatch@sdf.org>
Thu, 20 Jun 2019 08:51:16 +0000 (11:51 +0300)
committerrinpatch <rinpatch@sdf.org>
Thu, 20 Jun 2019 08:51:16 +0000 (11:51 +0300)

Trivial merge