Reviewed-by: aph, goetz, mdoerr
Contributed-by: NGustavo Serra Scalet <gustavo.scalet@eldorado.org.br>