CLC-4274 - Make my campus faster

https://jira.ets.berkeley.edu/jira/browse/CLC-4274
Merge pull request #2954 from christianv/CLC-4274

CLC-4274 - Make my campus faster