baidu
Merge branch 'hotfix/20141211-block02'