Merge branch 'release/jun29'
Merge branch 'release/jun30'
database.yml
Merge branch 'hotfix/database.yml' into develop