Commit by zhangkun on 2014/10/24