- Based on Edijus patch (terminedijsatyahoodotcom) See issue #6571 for more details. svn path=/trunk/; revision=54176