merge back 4.5 to master

[Daan Hoogland]

H devs,

I submitted a fix in 4.5 that I want to merge to master in a few
minutes. please stop me if you are in progress of a similar action.

-- 
Daan