Merge pull request #9601 from yuwata/small-fixes
authorLennart Poettering <lennart@poettering.net>
Tue, 17 Jul 2018 10:40:52 +0000 (12:40 +0200)
committerGitHub <noreply@github.com>
Tue, 17 Jul 2018 10:40:52 +0000 (12:40 +0200)
Small fixes


Trivial merge