saltstack/salt — pull request #17321 by cachedout (2014-11-10 21:46:05+00:00)
Title: Re-submit of #17120

Was originally reverted by #17187 but is now fixed up.