BTW, patch had conflicts with master. Please, find rebased version attached.
Sorry, but patch conflicts with master again.
--
Teodor Sigaev E-mail: teo...@sigaev.ru
WWW: http://www.sigaev.ru/
