saltstack/salt — pull request #18847 by rallytime (2014-12-09 18:27:47+00:00)
Title: Backport #18163 to 2014.7

Backport #18163 to 2014.7