494229 Merge branch 'mstrigl/add_matrix' into 'production'

Merged and Committed by lrupp 4 years ago
    Merge branch 'mstrigl/add_matrix' into 'production'
    
    New machine for matrix.o.o
    
    See merge request infra/salt!322