Signed-off-by: Victor Vieux <victorvieux@gmail.com> (cherry picked from commit 2f35d73b7dc7a9e234ea06f6145a26c37472c775) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 3569dac3c01f8966375b564e01ce1c29f0dc1aa0 Component: engine