PR: ports/67345 Submitted by: Roman Neuhauser <neuhauser@chello.cz>
PR: ports/62599 Submitted by: John Merryweather Cooper <coop9211@uidaho.edu>