Merge branch 'myfeature' into master
Added hotfix
Merge branch 'hotfix-1.2.1' into develop