commit 7
hotfix commit 1
hotfix commit 2
Merge branch 'master' into hotfix