Merge for backport of fix for issue #25930

This commit is contained in:
Brett Cannon 2015-12-28 17:30:57 -08:00
commit 53d1f24408

Diff content is not available