PR: ports/123080 Submitted by: KATO Tsuguru <tkato432 AT yahoo.com>
PR: 47827 Submitted by: David Magda <dmagda+fbugs@ee.ryerson.ca>