PR: 28105 Submitted by: Hye-Shik Chang <perky@python.or.kr>
PR: 19466 Submitted by: Kelly Yancey <kbyanc@posi.net>