PR: 148228, 146527 Submitted by: ale, Christer Edwards <christer.edwards@gmail.com> Reviewed by: ports