Fixed bug ABM-242
Merge branch 'bug-242' into develop
Merge branch 'develop' of https://github.com/SANDAG/ABM into develop