rebase against last commit

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>