added master file to master branch
fixed the hotfix
Merge branch 'master' into testing