git ship merges before squashing
Merge master