5eb578 Merge branch 'cboltz-dale' into 'production'

Merged and Committed by Christian Boltz a year ago
    Merge branch 'cboltz-dale' into 'production'
    
    dale.i.o.o also serves hackweek.o.o
    
    See merge request infra/salt!610