r10077: * multiple: Apply patch from Joerg Hoehle with multiple