add (c) Lennart Augustsson (part of #740)