Fixes for migrations
Local changes
Merge branch 'master' of https://github.com/chipzx/fetchit