saltstack/salt — pull request #18888 by thatch45 (2014-12-10 21:11:25+00:00)
Title: Merge #18871

Merge #18871 with fixes