поправил описание
Merge branch 'hotfix/yosemite'
Merge branch 'master' into develop