Merge urgent patch from anonymous

Someone needs this urgently and asked me to merge it. They do not wish
to be made known (??? ok...)