tree 787e7f5633247db55c66c6f8ddc67efb039101e8
parent 64e91275e37d881832b7c0cacd1b45c4c4ef4ba4
parent db6322cb8ac1a8edede92e1aa1e3c688742a7923
author Vinay Sajip <vinay_sajip@yahoo.co.uk> 1486063022 +0000
committer Vinay Sajip <vinay_sajip@yahoo.co.uk> 1486063022 +0000

Fixes #24875: Merged fix from 3.5.