Merge branch 'master' into avincent/helm_template_overridable_ssl_redirect

2 jobs for !176 with avincent/helm_template_overridable_ssl_redirect in 19 minutes and 49 seconds (queued for 7 seconds)
latest merge request