Merge branch 'master' into martin-t/vbots
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 18 Aug 2019 16:47:11 +0000 (18:47 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 18 Aug 2019 16:47:11 +0000 (18:47 +0200)

Trivial merge