patches

Signed-off-by: Emmanuel Mathot <emmanuel.mathot@gmail.com>
Tests

Signed-off-by: Emmanuel Mathot <emmanuel.mathot@gmail.com>