https://www.pivotaltracker.com/story/show/48342385 https://www.pivotaltracker.com/story/show/48342417
Merge branch 'dev_module_and_theme_location' into develop