First commit of my feature.
another commit
The fix should now be complete.
Merge branch 'master' into feature