PR: 19470 Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Submitted by: Ade Lovett <ade@lovett.com>