PR: ports/67345 Submitted by: Roman Neuhauser <neuhauser@chello.cz>
PR: 62605 Submitted by: John Merryweather Cooper Approved by: pav (mentor).