back-porting cap changes to develop branch (DHH-265)
Merge branch 'develop' of github.com:ucsdlib/damspas into develop