https://www.pivotaltracker.com/story/show/48617417
Merge branch 'dev_too_many_attractions_48617417' into develop