PR: ports/60092 Submitted by: Jamie Hermans <jamie@hermans.ca>
PR: 32916 Submitted by: Jamie Hermans <jamie@hermans.ca>