saltstack/salt — pull request #15460 by thatch45 (2014-09-02 23:40:53+00:00)
Title: Merge #15217 with fixes

Let the tests run