Bootstrap migration
Merge pull request #1023 from phaidon/bootstrap

[Wip] Bootstrap migration