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