saltstack/salt — pull request #17171 by thatch45 (2014-11-04 22:19:49+00:00)
Title: Merge #17136

Merge #17136 with fixes