merge from qiniu

merge from qiniu