Comment 8 for bug 1053048

I fixed this upstream: http://cgit.freedesktop.org/systemd/systemd/commit/?id=139e5336286

This depends on a couple of previous patches, so not that easy to cherry-pick. If this is urgent/necessary for vivid, I'd apply the original patch http://lists.freedesktop.org/archives/systemd-devel/2015-May/031925.html which was inferior, but backports better.