Merge branch 'hotfix/1.7.5' into develop

Conflicts:
findingaids/fa/templates/fa/base.html