Rebase me

Signed-off-by: Frédéric Vachon <fredvac@gmail.com>