Merge square's master into TAFlights