Signed-off-by: Josh Horwitz <horwitz@addthis.com> Upstream-commit: 456e0396596f6184ebd374336f0d4ad3046371ba Component: engine