Merge some master changes and shippable config