Updated with original "master" branch script.
Merge branch 'master' of github-trebortech:trebortech/salt-support