about to MERGE

[Daan Hoogland]

H,

I had a contribution from  colleague on master that I cherry-picked on
4.4 and 4.5.  I will merge 4.5 -s recursive -X ours in a few minute.
please alert me if this is inconvenient.

-- 
Daan