Merge branch 'Celthi-youku_bugfix'