Merge pull request #7884 from yuwata/small-fixes
authorLennart Poettering <lennart@poettering.net>
Mon, 15 Jan 2018 15:40:41 +0000 (16:40 +0100)
committerGitHub <noreply@github.com>
Mon, 15 Jan 2018 15:40:41 +0000 (16:40 +0100)
Small fixes


Trivial merge