Merge pull request #3911 from crrodriguez/asan-fixes
authorLennart Poettering <lennart@poettering.net>
Sat, 6 Aug 2016 15:02:17 +0000 (17:02 +0200)
committerGitHub <noreply@github.com>
Sat, 6 Aug 2016 15:02:17 +0000 (17:02 +0200)
Asan fixes


Trivial merge