Merge branch 'master' into test
authorMiroslav Ondra <ondra@faster.cz>
Tue, 13 Aug 2019 12:55:30 +0000 (14:55 +0200)
committerMiroslav Ondra <ondra@faster.cz>
Tue, 13 Aug 2019 12:55:30 +0000 (14:55 +0200)

Trivial merge