PR: 58166 Submitted by: Cheng-Lung Sung <clsung@dragon2.net>
Submitted by: Anton Berezin <tobez@tobez.org>
PR: 26086 Submitted by: Michael Johnson <ahze@ahze.net>