Updated to match salt-master branch