Merge remote-tracking branch 'origin/trunk' into contrib-settings-parity

# Conflicts:
# internal/web/handlers/profile/profile.go
# internal/web/handlers/profile/profile_test.go

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 2 days ago

tenseleyflow/shithub / `03dd0f6`