UPDATE:更新解析方式
Merge branch 'qunar-0715' into qunar