Merge branch 'new-comp' into build-28
Merge branch 'build-28' of github.com:GSA/ckanext-geodatagov into build-28