A minor change in test branch 1
A minor change in branch test2
Merge branch 'test2'
Both test branches have now been merged into the master branch.