Merge branch 'hotfix/fix140905'
fix bug
Merge branch 'hotfix/fix0919' into develop