Take two patches from upstream at the same time. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>