Merge branch 'hotfix/20141211-block01'
baidu
Merge branch 'hotfix/20141211-block02' into develop