Merge pull request #6533 from sceext2/fix-iqiyi-2015-08-10