tree 06eda88a34af535bb53439bf2598eabd1d272997
parent 993f535ae9276efc7be61fb06a67b629ff92e25d
parent db38b6c9a932da89c284cd8377af9f5c4beeb190
author Vinay Sajip <vinay_sajip@yahoo.co.uk> 1486063608 +0000
committer Vinay Sajip <vinay_sajip@yahoo.co.uk> 1486063608 +0000

Fixes #29213: merged fix from 3.5.