PR: 18446, 18456 Submitted by: Ville Eerola <ve@sci.fi>
PR: 16952 Submitted by: Mario Sergio Fujikawa Ferreira <lioux@linf.unb.br>