Merge pull request #12049 from keszybz/assorted-fixups
authorLennart Poettering <lennart@poettering.net>
Wed, 20 Mar 2019 17:27:34 +0000 (18:27 +0100)
committerGitHub <noreply@github.com>
Wed, 20 Mar 2019 17:27:34 +0000 (18:27 +0100)
Assorted fixups


Trivial merge