Merge branch 'master' into test
authorMiroslav Ondra <ondra@faster.cz>
Thu, 1 Oct 2020 08:39:44 +0000 (10:39 +0200)
committerMiroslav Ondra <ondra@faster.cz>
Thu, 1 Oct 2020 08:39:44 +0000 (10:39 +0200)

Trivial merge