saltstack/salt — pull request #18172 by thatch45 (2014-11-18 00:19:13+00:00)
Title: merge #18145

Merge #18145