saltstack/salt — pull request #12526 by markizano (2014-05-04 18:11:51+00:00)
Title: Addressing issues/concerns in #11611

Addressing issues/concerns in #11611
This is a redeploy of https://github.com/saltstack/salt/pull/12407