Backport Piers Lauder's checkin 1.30: fix missed conversion in ESR's string conversion This should be the *last* checkin in this branch, barring brown-bags, showstoppers and release cruft.