Here's the same patch made from the current master.

-- 
Best Regards,
Nikolay Kudryavtsev