https://www.pivotaltracker.com/story/show/48579167
Merge branch 'dev_db_and_files_bu_48579167' into develop