Patches automatically rebased.

Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>