Merge pull request #7458 from keszybz/two-build-fixes
authorLennart Poettering <lennart@poettering.net>
Fri, 24 Nov 2017 14:40:52 +0000 (15:40 +0100)
committerGitHub <noreply@github.com>
Fri, 24 Nov 2017 14:40:52 +0000 (15:40 +0100)
Two build fixes


Trivial merge