Merge pull request #2005 from dstftw/ivi.ru