merged
Merge branch 'my-bugfix-branch' into my-integration-branch

This is for ne mrege