PR: 12781 (14 of 19) Submitted by: Ade Lovett <ade@lovett.com>
PR: ports/7656 Submitted by: Nakai@technologist.com