r13677: patch from Max N. Boyarov <m.boyarov@sam-solutions.net>