Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Add latest migrations to default db script
Fix indent
Merge pull request #478 from hoffmabc/master

Add migration sql to setup_db script