migrations fix
git pushMerge branch 'master' of github.com:ging/vish