saltstack/salt — pull request #18957 by thatch45 (2014-12-12 16:59:56+00:00)
Title: Merge #18944

Merge #18944