https://www.pivotaltracker.com/story/show/49589683
Merge branch 'dev_pull_maps_49589683' into develop