Second round of changes with new file and new branch
Merge branch 'master' into newBranch
Merge branch 'newBranch'