Synchronize with upstream

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>