saltstack/salt — pull request #18607 by thatch45 (2014-12-01 17:20:39+00:00)
Title: Merge #18555

Merge #18555