Merge pull request #5406 from poettering/v233-prep
authorMartin Pitt <martinpitt@users.noreply.github.com>
Tue, 21 Feb 2017 14:04:02 +0000 (15:04 +0100)
committerGitHub <noreply@github.com>
Tue, 21 Feb 2017 14:04:02 +0000 (15:04 +0100)
V233 preparation


Trivial merge