Quick test of branching
This is the commit from iss53
Hopefully this should be merged into master
Merge branch 'iss53'
Trying to cause a branch conflict part 1
Trying to create a merge conflict part 2
Resolve merge conflicts