saltstack/salt — pull request #18189 by thatch45 (2014-11-18 04:01:02+00:00)
Title: Merge #18137

Merge #18137