Merge branch 'sceext2-fix-iqiyi-2015-07-17'