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