8a1a60f839
PR: 17405, 16320 Submitted by: Mark W. Krentel <krentel@dreamscape.com> Submitted by: Peter Edwards <peter.edwards@ireland.com> MFC after: 2 weeks