saltstack/salt — pull request #19141 by thatch45 (2014-12-19 20:59:07+00:00)
Title: Merge #19101 with fixes

I am keeping this linked with #19101 to preserve the discussion chain