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