Merge pull request #22 from salt-formulas/2017

Compatibility with salt 2017.7 and newer