Merge branch 'redirects_certbot_issue' into 'master'

Without a location nginx will always return

See merge request !313
2 jobs for master in 44 seconds (queued for 2 seconds)