saltstack/salt — pull request #15971 by rallytime (2014-09-19 16:12:44+00:00)
Title: Backport #15728 to 2014.7

Backport #15728 to 2014.7