Master offshore

Conflict pull request.