Issue #22343: Merged change from 3.6.

This commit is contained in:
Vinay Sajip 2017-01-12 17:14:42 +00:00
commit 88f17ff356