2013-07-24修改
Merge branch 'hotfix-2013-07-24' into develop