Fix typo in migration
Merge remote-tracking branch 'github/canary'