https://www.pivotaltracker.com/story/show/48342697 https://www.pivotaltracker.com/story/show/48342463
Merge branch 'dev_remove_and_update_mods_48342463_48342697' into develop