Applying https://github.com/CakeDC/migrations/pull/114 manually to the correct branch