codeship status badge refers to master branch
Merge branch 'master' into feature/bareonly