Fix contact form with trailing slashes
Merge branch 'site_fixes' into develop
Merge branch 'develop'