Adjust in db/seeds
Merge branch 'master' into delete_tags