a0dc3f8626
I've discovered I have this local diff that never got committed -- this should have been a part of r355424. Reproted by: Klaus Küchemann <maciphone2@googlemail.com>