f26a306026
Backported from master branch. Signed-off-by: Thomas Hochstein <thh@inter.net>
Backported from master branch. Signed-off-by: Thomas Hochstein <thh@inter.net>