PR: 11844 Submitted by: Jeremy Lea <reg@shale.csir.co.za>
PR: ports/9829 Submitted by: Jeremy Lea <reg@shale.csir.co.za>
Submitted by: Nakai@technologist.com