Merge branch 'master' of https://github.com/salt-formulas/salt-formula-reclass