merge changyou/master

merge changyou/master