New feature or whatever
Merge branch 'mybranch'