Merge branch 'stable' into release/2.0.0
authorrinpatch <rinpatch@sdf.org>
Thu, 5 Mar 2020 19:38:38 +0000 (22:38 +0300)
committerrinpatch <rinpatch@sdf.org>
Thu, 5 Mar 2020 19:38:38 +0000 (22:38 +0300)

Trivial merge