Merge from Shopify:master