PR: 15586 Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
PR: 6489 Submitted by: Ian Struble <ian@majesticnet.com>
Submitted by: David Leonard <d@scry.dstc.edu.au>