Signed-off-by: Daniel Golle <daniel@makrotopia.org> (cherry picked from commit 6fc8e06078)
6fc8e06078