saltstack/salt — pull request #17152 by thatch45 (2014-11-04 17:06:04+00:00)
Title: Merge #17142 with fixes

Merge #17142 with fixes