Merge branch 'develop' into fix/dymamic-docs
authorrinpatch <rinpatch@sdf.org>
Thu, 6 Feb 2020 12:04:21 +0000 (15:04 +0300)
committerrinpatch <rinpatch@sdf.org>
Thu, 6 Feb 2020 12:04:21 +0000 (15:04 +0300)

Trivial merge