saltstack/salt — pull request #16027 by rallytime (2014-09-22 16:01:12+00:00)
Title: Backport #15822 to 2014.7

Backport #15822 to 2014.7