Merge remote-tracking branch 'origin/stable'
changed models and added sql script
Merge branch 'master' into stable
foo commit
Merge branch 'master' into stable