Signed-off-by: Victor Vieux <victorvieux@gmail.com> (cherry picked from commit 1c44f35eb1f593839eec00f9ce810913e7309ef2) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 6db395b966cf44716d369c26dec2a5aabe6e2c1d Component: engine