added hotfix.txt
Merge branch 'hotfix'