saltstack/salt — pull request #17234 by thatch45 (2014-11-06 18:11:32+00:00)
Title: Merge #17181

Merge #17181