saltstack/salt — pull request #18104 by thatch45 (2014-11-14 21:41:47+00:00)
Title: Merge #18070 with fixes

Merge #18070 with fixes