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