[git] hotfix
[git] merge hotfix into master