Merge branch 'g1' into test
authorMiroslav Ondra <ondra@faster.cz>
Tue, 22 Sep 2020 22:52:27 +0000 (00:52 +0200)
committerMiroslav Ondra <ondra@faster.cz>
Tue, 22 Sep 2020 22:52:27 +0000 (00:52 +0200)

Trivial merge