Last commit before moving to master.

Signed-off-by: Antonio Carlos Ribeiro <acr@antoniocarlosribeiro.com>