eba52a Merge branch 'tbro-2018-01-19-add-kubic.o.o' into 'production'

Merged and Committed by Thorsten Bro 6 years ago
    Merge branch 'tbro-2018-01-19-add-kubic.o.o' into 'production'
    
    tbro-2018-01-19-add-kubic.o.o
    
    See merge request infra/salt!155