Merge branch 'master' into marin-t/fix
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 12 Aug 2019 10:21:46 +0000 (12:21 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 12 Aug 2019 10:21:46 +0000 (12:21 +0200)

Trivial merge