saltstack/salt — pull request #18646 by thatch45 (2014-12-02 16:42:21+00:00)
Title: Merge #18631 with fixes

Merge #18631 with fixes