PR: ports/79083, ports/79301 Submitted by: Anderson S. Ferreira <anderson@cnpm.embrapa.br> (maintainer)