additional changes
Merge branch 'foobar-1.0.0'