Resending 1.9

Added missing changes from 1.8.1

Signed-off-by: Gabriel Reguly <github@ppgr.com.br>