Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit f565bc7ec964537a4e20bf5d4e497d15c0c9b5bf)