Testing Pull Request
Merge branch 'master' of https://github.com/dmyerscough/salt-1