Merge Square's master into mine