Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net> Upstream-commit: ac9c0f81df348519ed3fba337fb862952afed58b Component: engine