Signed-off-by: Jean-Paul Calderone <exarkun@twistedmatrix.com> Upstream-commit: 0888c1880f836703987313049100bad9ce821584 Component: engine