added yet another foo, again
Merge branch 'branch2'