Patch from Eric Valette <valette@…> and Emmanuel Raguet <raguet@…> to make their patches work together.