Create hotfix.txt
Merge branch 'master' into jordanandmatthew-feature