Signed-off-by: Bastian Köcher <git@kchr.de> (cherry picked from commit 5378c856779c590e26910639e28b95a22aa2b9f5)