Merge branch 'master' into test
authorMiroslav Ondra <ondra@faster.cz>
Wed, 4 Sep 2019 23:37:47 +0000 (01:37 +0200)
committerMiroslav Ondra <ondra@faster.cz>
Wed, 4 Sep 2019 23:37:47 +0000 (01:37 +0200)

Trivial merge