nicolas-grekas Backport type fixes