Merge pull request #12783 from flyn-org/master
authorRosen Penev <redacted>
Sun, 12 Jul 2020 19:12:40 +0000 (12:12 -0700)
committerGitHub <redacted>
Sun, 12 Jul 2020 19:12:40 +0000 (12:12 -0700)
grilo-plugins: backport more updates from master


Trivial merge
git clone https://git.99rst.org/PROJECT