Issue #22343: Merged change from 3.5.

This commit is contained in:
Vinay Sajip 2017-01-12 17:13:27 +00:00
commit a44e2cd027