Merge branch 'develop' into feature/ci-release-build
authorrinpatch <rinpatch@sdf.org>
Thu, 13 Jun 2019 10:54:24 +0000 (13:54 +0300)
committerrinpatch <rinpatch@sdf.org>
Thu, 13 Jun 2019 10:54:24 +0000 (13:54 +0300)

Trivial merge