PR: 16607 Submitted by: Maxim Sobolev <sobomax@altavista.net>
PR: 16498 Submitted by: Maxim Sobolev <sobomax@altavista.net>
PR: 15944 Submitted by: Maxim Sobolev <sobomax@altavista.net>